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

[Git][ultreiaio/ird-observe][develop] 2 commits: update pom
by Tony CHEMIT 20 May '19

20 May '19

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: eb028109 by tchemit at 2019-05-20T17:25:16Z update pom - - - - - 8d95b20d by tchemit at 2019-05-20T17:25:43Z Editeurs d'url non actifs - Closes #1275 - - - - - 1 changed file: - pom.xml Changes: ===================================== pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>io.ultreia.maven</groupId> <artifactId>pom</artifactId> - <version>2019.8.17</version> + <version>2019.8.18</version> </parent> <groupId>fr.ird.observe</groupId> @@ -163,7 +163,7 @@   - + <lib.version.java4all.jaxx>3.0-alpha-51-SNAPSHOT</lib.version.java4all.jaxx>    View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/aa0397a00388f10cccc94c8138… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/aa0397a00388f10cccc94c8138… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Incohérence date de début date de fin - Closes #1276
by Tony CHEMIT 20 May '19

20 May '19

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: aa0397a0 by tchemit at 2019-05-20T17:12:35Z Incohérence date de début date de fin - Closes #1276 - - - - - 1 changed file: - observe-i18n/src/main/i18n/translations/observe_fr_FR.properties Changes: ===================================== observe-i18n/src/main/i18n/translations/observe_fr_FR.properties ===================================== @@ -911,7 +911,7 @@ observe.common.DataDto.captain=Capitaine observe.common.DataDto.dataQuality=Qualité de donnée observe.common.DataDto.departureHarbour=Port de départ observe.common.DataDto.depthRecorder=Enregistreur de profondeur -observe.common.DataDto.endDate=Date de début +observe.common.DataDto.endDate=Date de fin observe.common.DataDto.haulingIdentifier=Virage observe.common.DataDto.hookLost=Hameçon perdu observe.common.DataDto.landingHarbour=Port d'arrivée @@ -921,7 +921,7 @@ observe.common.DataDto.observer=Observateur observe.common.DataDto.program=Programme observe.common.DataDto.settingIdentifier=Filage observe.common.DataDto.speciesFate=Devenir espèce -observe.common.DataDto.startDate=Date de fin +observe.common.DataDto.startDate=Date de début observe.common.DataDto.timer=Horloge observe.common.DataDto.timerTimeOnBoard=Horodatage de montée à bord observe.common.DataDto.traceCutOff=Bas de ligne coupé View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/aa0397a00388f10cccc94c81387… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/aa0397a00388f10cccc94c81387… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Impossible de remplir le champ espèces - Closes #1273
by Tony CHEMIT 20 May '19

20 May '19

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 86240e68 by tchemit at 2019-05-20T12:34:46Z Impossible de remplir le champ espèces - Closes #1273 - - - - - 14 changed files: - client-core/src/main/java/fr/ird/observe/client/ui/content/api/ContentUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/content/api/ContentUI.jcss - client-core/src/main/java/fr/ird/observe/client/ui/content/api/data/list/ContentListUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/content/api/data/list/ContentListUI.jcss - client-core/src/main/java/fr/ird/observe/client/ui/content/api/data/list/ContentListUIHandler.java - client-core/src/main/java/fr/ird/observe/client/ui/content/api/data/table/ContentTableUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/content/api/data/table/ContentTableUI.jcss - 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/data/ll/logbook/LonglineGlobalCompositionLogbookUI.jaxx - 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/observation/LonglineDetailCompositionObsUI.jaxx - 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.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/observation/LonglineGlobalCompositionObsUI.jcss Changes: ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/api/ContentUI.jaxx ===================================== @@ -125,9 +125,9 @@ public void resetEdit() { <JPanel id='contentContainer'> <JXLayer UI='{blockLayerUI}' constraints='BorderLayout.CENTER'> - + <JScrollPane id='bodyScrollPane'> <JPanel id='body'/> - + </JScrollPane> </JXLayer> <Table id='actions' constraints='BorderLayout.SOUTH'/> ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/api/ContentUI.jcss ===================================== @@ -67,3 +67,7 @@ borderPainted:false; } +#bodyScrollPane { + verticalScrollBarPolicy:{JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED}; + horizontalScrollBarPolicy:{JScrollPane.HORIZONTAL_SCROLLBAR_NEVER}; +} ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/api/data/list/ContentListUI.jaxx ===================================== @@ -68,13 +68,13 @@ public abstract ContentListUIHandler<E, C, R, U> getHandler(); ]]></script> <JPanel id='body'> - <JScrollPane id='listPane' constraints='BorderLayout.CENTER' onFocusGained='list.requestFocus()' columnHeaderView='{listHeader}'> - <JPanel id='listPanel'> + <JPanel id='listPanel' constraints='BorderLayout.CENTER' > <JLabel id="emptyLabel" constraints='"empty"' styleClass="skipI18n"/> - <JList id='list' genericType='R' constraints='"list"' onMouseClicked='getHandler().onDataSelected(event)'/> + <JScrollPane id='listPane' constraints='"list"' onFocusGained='list.requestFocus()' columnHeaderView='{listHeader}'> + <JList id='list' genericType='R' onMouseClicked='getHandler().onDataSelected(event)'/> + <BeanListHeader id='listHeader' genericType='R'/> + </JScrollPane> </JPanel> - <BeanListHeader id='listHeader' genericType='R'/> - </JScrollPane> </JPanel> <Table id="actions" weightx='1' insets='0' fill="both"> @@ -105,4 +105,6 @@ public abstract ContentListUIHandler<E, C, R, U> getHandler(); </Table> <JButton id="showTechnicalInformations"/> +  + <JScrollPane id="bodyScrollPane"/> </fr.ird.observe.client.ui.content.api.ContentUI> ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/api/data/list/ContentListUI.jcss ===================================== @@ -30,6 +30,7 @@ #listPane { minimumSize:{new Dimension(10,150)}; + verticalScrollBarPolicy:{JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED}; } #listPanelLayout { @@ -104,3 +105,7 @@ #showTechnicalInformations { enabled:{model.isOneSelectedData()}; } + +#bodyScrollPane { + verticalScrollBarPolicy:{JScrollPane.VERTICAL_SCROLLBAR_NEVER}; +} \ No newline at end of file ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/api/data/list/ContentListUIHandler.java ===================================== @@ -125,11 +125,11 @@ public abstract class ContentListUIHandler<D extends IdDto, C extends DataDto, R getUi().getListSelectionModel().clearSelection(); if (!getModel().isEmpty()) { getUi().getListSelectionModel().setSelectionInterval(0, 0); - getUi().getListPane().setVerticalScrollBarPolicy(ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED); - } else { - - getUi().getListPane().setVerticalScrollBarPolicy(ScrollPaneConstants.VERTICAL_SCROLLBAR_NEVER); +// getUi().getListPane().setVerticalScrollBarPolicy(ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED); } +// else { +// getUi().getListPane().setVerticalScrollBarPolicy(ScrollPaneConstants.VERTICAL_SCROLLBAR_NEVER); +// } }); } ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/api/data/table/ContentTableUI.jaxx ===================================== @@ -187,4 +187,6 @@ public abstract SwingValidator<C> getValidatorTable(); </JToolBar> </JPanel> +  + <JScrollPane id="bodyScrollPane"/> </fr.ird.observe.client.ui.content.api.ContentUI> ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/api/data/table/ContentTableUI.jcss ===================================== @@ -136,3 +136,8 @@ verticalAlignment:"center"; horizontalAlignment:"center"; } + +#bodyScrollPane { + verticalScrollBarPolicy:{JScrollPane.VERTICAL_SCROLLBAR_NEVER}; +} + ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/api/data/table/ContentTableUIInitializer.java ===================================== @@ -90,7 +90,7 @@ public class ContentTableUIInitializer<D extends DataDto, C extends DataDto, U e if (ui.getBody() != null) { // on supprime le layer de blocage en mode disable - UIHelper.setLayerUI(ui.getBody(), null); + UIHelper.setLayerUI(ui.getBodyScrollPane(), null); } if (ui.getExtraZone() != null) { ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/logbook/LonglineGlobalCompositionLogbookUI.jaxx ===================================== @@ -136,4 +136,6 @@ <HooksCompositionLogbookUIModel id="hooksCompositionModel" initializer="hooksCompositionUI.getModel()"/> <BaitsCompositionLogbookUIModel id="baitsCompositionModel" initializer="baitsCompositionUI.getModel()"/> +  + <JScrollPane id="bodyScrollPane"/> </fr.ird.observe.client.ui.content.api.data.simple.ContentSimpleUI> ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/logbook/LonglineGlobalCompositionLogbookUI.jcss ===================================== @@ -34,3 +34,7 @@ mitigationType { universeLabel:{t("observe.common.SetLonglineLogbookGlobalCompositionDto.availableMitigationType")}; selectedLabel:{t("observe.common.SetLonglineLogbookGlobalCompositionDto.selectedMitigationType")}; } + +#bodyScrollPane { + verticalScrollBarPolicy:{javax.swing.JScrollPane.VERTICAL_SCROLLBAR_NEVER}; +} \ No newline at end of file ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/observation/LonglineDetailCompositionObsUI.jaxx ===================================== @@ -184,4 +184,7 @@ <BranchlineObsUIModel id="branchlineDetailUIModel" initializer="branchlineDetailUI.getModel()"/> +  + <JScrollPane id="bodyScrollPane"/> + </fr.ird.observe.client.ui.content.api.data.simple.ContentSimpleUI> ===================================== 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()}; } + +#bodyScrollPane { + verticalScrollBarPolicy:{JScrollPane.VERTICAL_SCROLLBAR_NEVER}; +} \ No newline at end of file ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/observation/LonglineGlobalCompositionObsUI.jaxx ===================================== @@ -137,4 +137,6 @@ <HooksCompositionObsUIModel id="hooksCompositionModel" initializer="hooksCompositionUI.getModel()"/> <BaitsCompositionObsUIModel id="baitsCompositionModel" initializer="baitsCompositionUI.getModel()"/> +  + <JScrollPane id="bodyScrollPane"/> </fr.ird.observe.client.ui.content.api.data.simple.ContentSimpleUI> ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/observation/LonglineGlobalCompositionObsUI.jcss ===================================== @@ -34,3 +34,7 @@ universeLabel:{t("observe.common.SetLonglineObsGlobalCompositionDto.availableMitigationType")}; selectedLabel:{t("observe.common.SetLonglineObsGlobalCompositionDto.selectedMitigationType")}; } + +#bodyScrollPane { + verticalScrollBarPolicy:{javax.swing.JScrollPane.VERTICAL_SCROLLBAR_NEVER}; +} \ No newline at end of file View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/86240e6876e9760f5f93103e8c5… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/86240e6876e9760f5f93103e8c5… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Fix trip vessel validator
by Tony CHEMIT 20 May '19

20 May '19

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: badfad6b by tchemit at 2019-05-20T11:19:29Z Fix trip vessel validator - - - - - 7 changed files: - persistence/src/main/java/fr/ird/observe/entities/data/ll/common/TripLonglineTopiaDao.java - persistence/src/main/java/fr/ird/observe/entities/data/ps/common/TripSeineTopiaDao.java - services-validation/src/main/java/fr/ird/observe/validation/validators/TripVesselDtoValidator.java - validation/src/main/resources/fr/ird/observe/dto/data/ll/common/TripLonglineDto-create-error-validation.xml - validation/src/main/resources/fr/ird/observe/dto/data/ll/common/TripLonglineDto-update-error-validation.xml - validation/src/main/resources/fr/ird/observe/dto/data/ps/common/TripSeineDto-create-error-validation.xml - validation/src/main/resources/fr/ird/observe/dto/data/ps/common/TripSeineDto-update-error-validation.xml Changes: ===================================== persistence/src/main/java/fr/ird/observe/entities/data/ll/common/TripLonglineTopiaDao.java ===================================== @@ -40,6 +40,7 @@ import java.util.Collections; import java.util.Date; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.stream.Collectors; public class TripLonglineTopiaDao extends AbstractTripLonglineTopiaDao<TripLongline> { @@ -152,13 +153,13 @@ public class TripLonglineTopiaDao extends AbstractTripLonglineTopiaDao<TripLongl } return this. <TripLongline>stream("From TripLonglineImpl Where vessel.id = :vesselId " + - "And (( startDate <= :startDate And endDate <= :endDate ) " + - " Or ( startDate >= :startDate And :endDate <= endDate )) " + + "And (( :startDate <= endDate And :endDate >= endDate ) " + + " Or ( :endDate <= startDate And :endDate >= startDate )) " + "Order By startDate, endDate", ImmutableMap.of( "vesselId", vesselId, "startDate", startDate, "endDate", endDate)) - .filter(t -> id == null || !id.equals(t.getTopiaId())) + .filter(t -> !Objects.equals(id ,t.getTopiaId())) .collect(Collectors.toList()); } private static class TripMapActivityObsPointQuery extends TopiaSqlQuery<List<TripMapPoint>> { ===================================== persistence/src/main/java/fr/ird/observe/entities/data/ps/common/TripSeineTopiaDao.java ===================================== @@ -38,6 +38,7 @@ import java.util.Collections; import java.util.Date; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.stream.Collectors; /** @@ -91,13 +92,13 @@ public class TripSeineTopiaDao extends AbstractTripSeineTopiaDao<TripSeine> { } return this. <TripSeine>stream("From TripSeineImpl Where vessel.id = :vesselId " + - "And (( startDate <= :startDate And endDate <= :endDate ) " + - " Or ( startDate >= :startDate And :endDate <= endDate )) " + + "And (( :startDate <= endDate And :endDate >= endDate ) " + + " Or ( :endDate <= startDate And :endDate >= startDate )) " + "Order By startDate, endDate", ImmutableMap.of( "vesselId", vesselId, "startDate", startDate, "endDate", endDate)) - .filter(t -> id == null || !id.equals(t.getTopiaId())) + .filter(t -> !Objects.equals(id , t.getTopiaId())) .collect(Collectors.toList()); } ===================================== services-validation/src/main/java/fr/ird/observe/validation/validators/TripVesselDtoValidator.java ===================================== @@ -24,12 +24,12 @@ package fr.ird.observe.validation.validators; import com.opensymphony.xwork2.validator.ValidationException; import com.opensymphony.xwork2.validator.validators.FieldValidatorSupport; -import fr.ird.observe.dto.data.TripDto; import fr.ird.observe.dto.data.TripReference; -import fr.ird.observe.dto.data.ll.common.TripLonglineDto; -import fr.ird.observe.dto.data.ps.common.TripSeineDto; +import fr.ird.observe.dto.referential.common.VesselReference; import fr.ird.observe.services.service.data.TripService; +import java.util.Date; +import java.util.Objects; import java.util.Set; import static io.ultreia.java4all.i18n.I18n.n; @@ -43,6 +43,8 @@ import static io.ultreia.java4all.i18n.I18n.n; */ public class TripVesselDtoValidator extends FieldValidatorSupport { + private String serviceName; + public TripVesselDtoValidator() { setDefaultMessage(n("observe.validation.trip.vessel.overlap")); } @@ -57,29 +59,27 @@ public class TripVesselDtoValidator extends FieldValidatorSupport { return "vessel"; } + public void setServiceName(String serviceName) { + this.serviceName = serviceName; + } + @Override public void validate(Object object) throws ValidationException { - - TripSeineDto currentTripSeine = (TripSeineDto) getFieldValue("currentTripSeine", object); - if (currentTripSeine != null) { - validate(object, "servicesProvider.tripSeineService", currentTripSeine); - return; - } - TripLonglineDto currentTripLongline = (TripLonglineDto) getFieldValue("currentTripLongline", object); - if (currentTripLongline != null) { - validate(object, "servicesProvider.tripLonglineService", currentTripLongline); - return; - } - throw new IllegalStateException("Could not find any selected trip"); + Objects.requireNonNull(serviceName,"Service name can not be null"); + VesselReference vessel = (VesselReference) getFieldValue("vessel", object); + Date startDate = (Date) getFieldValue("startDate", object); + Date endDate = (Date) getFieldValue("endDate", object); + String id = (String) getFieldValue("id", object); + validate(object, id, vessel, startDate, endDate); } - private void validate(Object object, String tripServiceName, TripDto trip) throws ValidationException { + private void validate(Object object, String id, VesselReference vessel, Date startDate, Date endDate) throws ValidationException { - TripService tripService = (TripService) getFieldValue(tripServiceName, object); - Set<? extends TripReference> matchingTrips = tripService.getMatchingTripsVesselWithinDateRange(trip.getId(), - trip.getVessel().getVesselTypeId(), - trip.getStartDate(), - trip.getEndDate()); + TripService tripService = (TripService) getFieldValue(serviceName, object); + Set<? extends TripReference> matchingTrips = tripService.getMatchingTripsVesselWithinDateRange(id, + vessel.getId(), + startDate, + endDate); if (matchingTrips.size() > 0) { addFieldError(getFieldName(), object); ===================================== validation/src/main/resources/fr/ird/observe/dto/data/ll/common/TripLonglineDto-create-error-validation.xml ===================================== @@ -39,6 +39,7 @@ <message/> </field-validator> <field-validator type="tripVessel" short-circuit="true"> + <param name="serviceName">servicesProvider.tripLonglineService</param> <message/> </field-validator> </field> ===================================== validation/src/main/resources/fr/ird/observe/dto/data/ll/common/TripLonglineDto-update-error-validation.xml ===================================== @@ -41,6 +41,7 @@ <message/> </field-validator> <field-validator type="tripVessel" short-circuit="true"> + <param name="serviceName">servicesProvider.tripLonglineService</param> <message/> </field-validator> </field> ===================================== validation/src/main/resources/fr/ird/observe/dto/data/ps/common/TripSeineDto-create-error-validation.xml ===================================== @@ -36,6 +36,7 @@ <message/> </field-validator> <field-validator type="tripVessel" short-circuit="true"> + <param name="serviceName">servicesProvider.tripSeineService</param> <message/> </field-validator> </field> ===================================== validation/src/main/resources/fr/ird/observe/dto/data/ps/common/TripSeineDto-update-error-validation.xml ===================================== @@ -35,6 +35,7 @@ <message/> </field-validator> <field-validator type="tripVessel" short-circuit="true"> + <param name="serviceName">servicesProvider.tripSeineService</param> <message/> </field-validator> </field> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/badfad6bfd0f882e908c29c5357… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/badfad6bfd0f882e908c29c5357… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Ecran marée LL et PS - Aucun navire dans la liste déroulante - Closes #1272
by Tony CHEMIT 20 May '19

20 May '19

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 423eb13d by tchemit at 2019-05-20T10:28:52Z Ecran marée LL et PS - Aucun navire dans la liste déroulante - Closes #1272 - - - - - 1 changed file: - client-configuration/src/main/java/fr/ird/observe/client/configuration/ClientConfig.java Changes: ===================================== client-configuration/src/main/java/fr/ird/observe/client/configuration/ClientConfig.java ===================================== @@ -110,16 +110,16 @@ public class ClientConfig extends GeneratedClientConfig implements NavigationTre }; //FIXME PROTECTED-ID private final ImmutableSet<String> longlineVesselTypeIds = ImmutableSet.copyOf( - Sets.newHashSet("'fr.ird.referential.common.VesselType#1239832675735#0.044156847891821505", - "'fr.ird.referential.common.VesselType#1239832675736#0.8708229847859869", - "'fr.ird.referential.common.VesselType#1239832686137#0.1")); + Sets.newHashSet("fr.ird.referential.common.VesselType#1239832675735#0.044156847891821505", + "fr.ird.referential.common.VesselType#1239832675736#0.8708229847859869", + "fr.ird.referential.common.VesselType#1239832686137#0.1")); //FIXME PROTECTED-ID private final ImmutableSet<String> seineVesselTypeIds = ImmutableSet.copyOf( - Sets.newHashSet("'fr.ird.referential.common.VesselType#1239832675735#0.044156847891821505", - "'fr.ird.referential.common.VesselType#1239832675735#0.307197212385357", - "'fr.ird.referential.common.VesselType#1239832675735#0.7380146830307519", - "'fr.ird.referential.common.VesselType#1239832675735#0.9086075071905084", - "'fr.ird.referential.common.VesselType#1239832675737#0.43324169605639407")); + Sets.newHashSet("fr.ird.referential.common.VesselType#1239832675735#0.044156847891821505", + "fr.ird.referential.common.VesselType#1239832675735#0.307197212385357", + "fr.ird.referential.common.VesselType#1239832675735#0.7380146830307519", + "fr.ird.referential.common.VesselType#1239832675735#0.9086075071905084", + "fr.ird.referential.common.VesselType#1239832675737#0.43324169605639407")); private final SimpleDateFormat dateFormat = new SimpleDateFormat(); /** * un drapeau pour savoir s'il faut lancer l'interface graphique. Cette View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/423eb13da872de78a73fe2722dc… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/423eb13da872de78a73fe2722dc… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 2 commits: Fix FOB form
by Tony CHEMIT 17 May '19

17 May '19

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 6a7185c2 by tchemit at 2019-05-17T11:16:47Z Fix FOB form - - - - - 8390a6cf by tchemit at 2019-05-17T11:42:28Z Fix LL-Obs-CatchLongline form - - - - - 3 changed files: - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/observation/CatchLonglineObsUIHandler.java - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/observation/CatchLonglineObsUIModel.java - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/observation/FloatingObjectUIHandler.java Changes: ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/observation/CatchLonglineObsUIHandler.java ===================================== @@ -193,7 +193,7 @@ public class CatchLonglineObsUIHandler extends ContentTableUIHandler<SetLongline setTableModelEditable(model.isEditable()); positionHelper = new LonglinePositionHelper<>(ui.getSection(), ui.getBasket(), ui.getBranchline(), getModel().getTableEditBean()); - model.addPropertyChangeListener(CatchLonglineObsUIModel.PROPERTY_BRANCHLINE_TIME_SINCE_CONTACT, evt -> ui.getBranchlineValidator().setChanged(true)); + model.addPropertyChangeListener(CatchLonglineObsUIModel.PROPERTY_TIME_SINCE_CONTACT, evt -> ui.getBranchlineValidator().setChanged(true)); } @Override @@ -503,7 +503,7 @@ public class CatchLonglineObsUIHandler extends ContentTableUIHandler<SetLongline CatchLonglineObsUIModel model = getModel(); if (BooleanUtils.isTrue(branchline.getTimer())) { Calendar calendar = Calendar.getInstance(); - calendar.setTime(model.getBranchlineTimeSinceContact()); + calendar.setTime(model.getTimeSinceContact()); int minutes = calendar.get(Calendar.MINUTE); int hours = calendar.get(Calendar.HOUR); branchline.setTimeSinceContact(minutes + 60L * hours); @@ -665,7 +665,7 @@ public class CatchLonglineObsUIHandler extends ContentTableUIHandler<SetLongline if (newValue == null) { log.info(prefix + "Remove branchline"); branchlineValidator.setBean(null); - model.setBranchlineTimeSinceContact(null); + model.setTimeSinceContact(null); } else { log.info(prefix + "Use branchline: " + newValue); @@ -682,11 +682,11 @@ public class CatchLonglineObsUIHandler extends ContentTableUIHandler<SetLongline Long timeSinceContact = branchline.getTimeSinceContact(); if (timeSinceContact != null) { Date timeSinceContactDate = DateUtil.createDate(0, (int) (timeSinceContact % 60), (int) (timeSinceContact / 60f), 0, 0, 0); - model.setBranchlineTimeSinceContact(timeSinceContactDate); + model.setTimeSinceContact(timeSinceContactDate); } } else { Date timeSinceContactDate = DateUtil.createDate(0, 0, 0, 0, 0, 0); - model.setBranchlineTimeSinceContact(timeSinceContactDate); + model.setTimeSinceContact(timeSinceContactDate); } branchlineValidator.setBean(branchline); } ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/observation/CatchLonglineObsUIModel.java ===================================== @@ -28,6 +28,9 @@ import fr.ird.observe.client.ui.content.api.data.table.ContentTableUI; import fr.ird.observe.client.ui.content.api.data.table.ContentTableUIModel; import fr.ird.observe.dto.data.ll.observation.CatchLonglineObsDto; import fr.ird.observe.dto.data.ll.observation.SetLonglineObsCatchDto; +import io.ultreia.java4all.bean.JavaBean; +import io.ultreia.java4all.bean.definition.JavaBeanDefinition; +import io.ultreia.java4all.bean.spi.GenerateJavaBeanDefinition; import org.nuiton.util.beans.Binder; import org.nuiton.util.beans.BinderModelBuilder; @@ -41,9 +44,10 @@ import java.util.List; * @author Tony Chemit - dev(a)tchemit.fr * @since 3.7 */ -public class CatchLonglineObsUIModel extends ContentTableUIModel<SetLonglineObsCatchDto, CatchLonglineObsDto> { +@GenerateJavaBeanDefinition +public class CatchLonglineObsUIModel extends ContentTableUIModel<SetLonglineObsCatchDto, CatchLonglineObsDto> implements JavaBean { - public static final String PROPERTY_BRANCHLINE_TIME_SINCE_CONTACT = "branchlineTimeSinceContact"; + public static final String PROPERTY_TIME_SINCE_CONTACT = "timeSinceContact"; public static final String PROPERTY_SHOW_INDIVIDUAL_TABS = "showIndividualTabs"; @@ -58,15 +62,7 @@ public class CatchLonglineObsUIModel extends ContentTableUIModel<SetLonglineObsC */ protected boolean showIndividualTabs; - protected boolean caracteristicsTabValid; - - protected boolean depredatedTabValid; - - protected boolean foodAndSexualTabValid; - - protected boolean branchlineTabValid; - - protected Date branchlineTimeSinceContact; + protected Date timeSinceContact; public CatchLonglineObsUIModel(CatchLonglineObsUI ui) { super(SetLonglineObsCatchDto.class, @@ -139,14 +135,14 @@ public class CatchLonglineObsUIModel extends ContentTableUIModel<SetLonglineObsC firePropertyChange(PROPERTY_SHOW_INDIVIDUAL_TABS, null, showIndividualTabs); } - public Date getBranchlineTimeSinceContact() { - return branchlineTimeSinceContact; + public Date getTimeSinceContact() { + return timeSinceContact; } - public void setBranchlineTimeSinceContact(Date branchlineTimeSinceContact) { + public void setTimeSinceContact(Date timeSinceContact) { // Date oldValue = getBranchlineTimeSinceContact(); - this.branchlineTimeSinceContact = branchlineTimeSinceContact; - firePropertyChange(PROPERTY_BRANCHLINE_TIME_SINCE_CONTACT, null, branchlineTimeSinceContact); + this.timeSinceContact = timeSinceContact; + firePropertyChange(PROPERTY_TIME_SINCE_CONTACT, null, timeSinceContact); } @@ -166,4 +162,15 @@ public class CatchLonglineObsUIModel extends ContentTableUIModel<SetLonglineObsC } + /** + * Lazy helper class that manages all java bean operations. + * + * @see #javaBeanDefinition() + */ + private transient final JavaBeanDefinition javaBeanDefinition = new CatchLonglineObsUIModelJavaBeanDefinition(); + + @Override + public JavaBeanDefinition javaBeanDefinition() { + return javaBeanDefinition; + } } ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/observation/FloatingObjectUIHandler.java ===================================== @@ -73,7 +73,7 @@ public class FloatingObjectUIHandler extends ContentEditUIHandler<FloatingObject ObjectMaterialHierarchyDto detailedForm = getFloatingObjectService().getObjectMaterialHierarchy(); //FIXME-PROTECTED-ID - ObjectMaterialTypeReference booleanType = getReferentialReferences(ObjectMaterialTypeReference.class).stream().filter(e -> e.getTopiaId().equals("fr.ird.referential.ps.ObjectMaterialType#0#0")).findFirst().orElseThrow(IllegalStateException::new); + ObjectMaterialTypeReference booleanType = getReferentialReferences(ObjectMaterialTypeReference.class).stream().filter(e -> e.getTopiaId().equals("fr.ird.referential.ps.observation.ObjectMaterialType#0#0")).findFirst().orElseThrow(IllegalStateException::new); for (ObjectMaterialHierarchyDto objectMaterialHierarchyDto : detailedForm.getChildren()) { if (objectMaterialHierarchyDto.isEnabled()) { View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/2808ba1bf555cb174a9526b888… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/2808ba1bf555cb174a9526b888… You're receiving this email because of your account on gitlab.com.

1 0

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

13 May '19

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 2808ba1b by tchemit at 2019-05-13T22:13:23Z update changelog - - - - - 6 changed files: - + .mvn/gitlab-cache/milestones/866537-artifacts.json - .mvn/gitlab-cache/milestones/866537-issues.json - .mvn/gitlab-cache/milestones/866537.json - + .mvn/gitlab-cache/milestones/873393-issues.json - + .mvn/gitlab-cache/milestones/873393.json - CHANGELOG.md Changes: ===================================== .mvn/gitlab-cache/milestones/866537-artifacts.json ===================================== @@ -0,0 +1,12 @@ +[ + { + "name": "Application", + "filename": "observe-7.0.7.zip", + "url": "http://repo1.maven.org/maven2/fr/ird/observe/observe/7.0.7/observe-7.0.7.zip" + }, + { + "name": "Serveur", + "filename": "observe-7.0.7.war", + "url": "http://repo1.maven.org/maven2/fr/ird/observe/observe/7.0.7/observe-7.0.7.war" + } +] \ No newline at end of file ===================================== .mvn/gitlab-cache/milestones/866537-issues.json ===================================== @@ -1,11 +1,14 @@ [ { - "id": 20078138, - "iid": 1269, + "id": 20727608, + "iid": 1270, "projectId": 2722779, - "title": "[TREE] Parfois un affichage tronqué sans raison", - "description": "Vu avec la v7.0.5 et v7.0.6 :\n\n![image](/uploads/0340bff3be051a10bfbbd47cbc312230/image.png)\n\n![image](/uploads/4c6f4de473bae2e152345b780d43fac6/image.png)", - "labels": [], + "title": "[SYNCHRO SIMPLE] Une requête DELETE échoue pour cause de violation de contrainte FK", + "description": "Nous avons une base locale dans laquelle une espèce n\u0027existe plus dans le référentiel de la base centrale.\n\nCette espèce ayant été utilisée par l\u0027observateur, ObServe présente l\u0027UI de remplacement de code. On s\u0027exécute et le processus se déroulement correctement. La synchro du référentiel se termine sans erreur. A l\u0027issue de la synchro du référentiel toutefois, l\u0027espèce DYL (fr.ird.observe.entities.referentiel.Species#1551868196804#0.09929351272816189) reste dans le référentiel de la base locale alors qu\u0027elle n\u0027existe pas dans la base centrale (est-ce normal ?)\n\nEnsuite, lors de l\u0027étape d\u0027envoi de la marée dans la base centrale, il semble que le système essaie d\u0027abord de supprimer cette espèce du référentiel local avant d\u0027envoyer la marée (qui ne l\u0027utilise plus suite au remplacement de code), mais cela échoue. Le message indique que l\u0027espèce est encore présente dans les associations espèces/océans :\n\nEspèce concernée : DYL / fr.ird.observe.entities.referentiel.Species#1551868196804#0.09929351272816189\n\n```\nSauvegarde de la base locale vers C:\\Users\\pcauquil\\.observe\\backup\\obstuna-local-2019-05-09--13-46-42.sql.gz\nSauvegarde du référentiel.\norg.nuiton.topia.persistence.TopiaException: Could not execute sql code\n\tat org.nuiton.topia.persistence.internal.support.HibernateTopiaSqlSupport.doSqlWork(HibernateTopiaSqlSupport.java:168)\n\tat fr.ird.observe.services.local.service.actions.synchro.referential.legacy.UnidirectionalReferentialSynchronizeLocalServiceLocal.applySqlRequests(UnidirectionalReferentialSynchronizeLocalServiceLocal.java:158)\n\tat sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)\n\tat sun.reflect.NativeMethodAccessorImpl.invoke(Unknown Source)\n\tat sun.reflect.DelegatingMethodAccessorImpl.invoke(Unknown Source)\n\tat java.lang.reflect.Method.invoke(Unknown Source)\n\tat fr.ird.observe.services.local.ObserveServiceFactoryLocal$ObserveServiceInvocationHandler.invokeMethod(ObserveServiceFactoryLocal.java:242)\n\tat fr.ird.observe.services.local.ObserveServiceFactoryLocal$ObserveServiceInvocationHandler.invokeMethodWithTransaction(ObserveServiceFactoryLocal.java:263)\n\tat fr.ird.observe.services.local.ObserveServiceFactoryLocal$ObserveServiceInvocationHandler.invoke(ObserveServiceFactoryLocal.java:230)\n\tat com.sun.proxy.$Proxy75.applySqlRequests(Unknown Source)\n\tat fr.ird.observe.services.service.actions.synchro.referential.legacy.UnidirectionalReferentialSynchronizeEngine.finish(UnidirectionalReferentialSynchronizeEngine.java:159)\n\tat fr.ird.observe.client.ui.admin.save.SaveLocalUIHandler.saveUnidirectionalSynchronizeReferential(SaveLocalUIHandler.java:163)\n\tat fr.ird.observe.client.ui.admin.save.SaveLocalUIHandler.doAction(SaveLocalUIHandler.java:149)\n\tat org.nuiton.jaxx.runtime.swing.application.ActionWorker.doInBackground(ActionWorker.java:91)\n\tat javax.swing.SwingWorker$1.call(Unknown Source)\n\tat java.util.concurrent.FutureTask.run(Unknown Source)\n\tat javax.swing.SwingWorker.run(Unknown Source)\n\tat java.util.concurrent.ThreadPoolExecutor.runWorker(Unknown Source)\n\tat java.util.concurrent.ThreadPoolExecutor$Worker.run(Unknown Source)\n\tat java.lang.Thread.run(Unknown Source)\nCaused by: org.hibernate.exception.ConstraintViolationException: error executing work\n\tat org.hibernate.exception.internal.SQLStateConversionDelegate.convert(SQLStateConversionDelegate.java:112)\n\tat org.hibernate.exception.internal.StandardSQLExceptionConverter.convert(StandardSQLExceptionConverter.java:42)\n\tat org.hibernate.engine.jdbc.spi.SqlExceptionHelper.convert(SqlExceptionHelper.java:113)\n\tat org.hibernate.engine.jdbc.spi.SqlExceptionHelper.convert(SqlExceptionHelper.java:99)\n\tat org.hibernate.engine.jdbc.internal.JdbcCoordinatorImpl.coordinateWork(JdbcCoordinatorImpl.java:325)\n\tat org.hibernate.internal.SessionImpl.doWork(SessionImpl.java:2448)\n\tat org.hibernate.internal.SessionImpl.doWork(SessionImpl.java:2433)\n\tat org.nuiton.topia.persistence.internal.support.HibernateTopiaSqlSupport.doSqlWork(HibernateTopiaSqlSupport.java:166)\n\t... 19 more\nCaused by: org.h2.jdbc.JdbcBatchUpdateException: Referential integrity constraint violation: \"FK_OCEAN_SPECIES_SPECIES: OBSERVE_COMMON.OCEAN_SPECIES FOREIGN KEY(SPECIES) REFERENCES OBSERVE_COMMON.SPECIES(TOPIAID) (\u0027fr.ird.observe.entities.referentiel.Species#1551868196804#0.09929351272816189\u0027)\"; SQL statement:\nDELETE FROM OBSERVE_COMMON.species WHERE topiaId \u003d \u0027fr.ird.observe.entities.referentiel.Species#1551868196804#0.09929351272816189\u0027;\n [23503-196]\n\tat org.h2.jdbc.JdbcStatement.executeBatch(JdbcStatement.java:688)\n\tat com.zaxxer.hikari.pool.ProxyStatement.executeBatch(ProxyStatement.java:128)\n\tat com.zaxxer.hikari.pool.HikariProxyStatement.executeBatch(HikariProxyStatement.java)\n\tat fr.ird.observe.services.local.service.actions.synchro.referential.sql.ApplySqlRequestWork.flush(ApplySqlRequestWork.java:62)\n\tat fr.ird.observe.services.local.service.actions.synchro.referential.sql.ApplySqlRequestWork.execute(ApplySqlRequestWork.java:57)\n\tat org.nuiton.topia.persistence.internal.support.HibernateTopiaSqlSupport$HibernateTopiaSqlWork.execute(HibernateTopiaSqlSupport.java:91)\n\tat org.hibernate.jdbc.WorkExecutor.executeWork(WorkExecutor.java:37)\n\tat org.hibernate.internal.SessionImpl$1.accept(SessionImpl.java:2429)\n\tat org.hibernate.internal.SessionImpl$1.accept(SessionImpl.java:2426)\n\tat org.hibernate.engine.jdbc.internal.JdbcCoordinatorImpl.coordinateWork(JdbcCoordinatorImpl.java:320)\n\t... 22 more\n\norg.nuiton.topia.persistence.TopiaException: Could not execute sql code\n\tat org.nuiton.topia.persistence.internal.support.HibernateTopiaSqlSupport.doSqlWork(HibernateTopiaSqlSupport.java:168)\n\tat fr.ird.observe.services.local.service.actions.synchro.referential.legacy.UnidirectionalReferentialSynchronizeLocalServiceLocal.applySqlRequests(UnidirectionalReferentialSynchronizeLocalServiceLocal.java:158)\n\tat sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)\n\tat sun.reflect.NativeMethodAccessorImpl.invoke(Unknown Source)\n\tat sun.reflect.DelegatingMethodAccessorImpl.invoke(Unknown Source)\n\tat java.lang.reflect.Method.invoke(Unknown Source)\n\tat fr.ird.observe.services.local.ObserveServiceFactoryLocal$ObserveServiceInvocationHandler.invokeMethod(ObserveServiceFactoryLocal.java:242)\n\tat fr.ird.observe.services.local.ObserveServiceFactoryLocal$ObserveServiceInvocationHandler.invokeMethodWithTransaction(ObserveServiceFactoryLocal.java:263)\n\tat fr.ird.observe.services.local.ObserveServiceFactoryLocal$ObserveServiceInvocationHandler.invoke(ObserveServiceFactoryLocal.java:230)\n\tat com.sun.proxy.$Proxy75.applySqlRequests(Unknown Source)\n\tat fr.ird.observe.services.service.actions.synchro.referential.legacy.UnidirectionalReferentialSynchronizeEngine.finish(UnidirectionalReferentialSynchronizeEngine.java:159)\n\tat fr.ird.observe.client.ui.admin.save.SaveLocalUIHandler.saveUnidirectionalSynchronizeReferential(SaveLocalUIHandler.java:163)\n\tat fr.ird.observe.client.ui.admin.save.SaveLocalUIHandler.doAction(SaveLocalUIHandler.java:149)\n\tat org.nuiton.jaxx.runtime.swing.application.ActionWorker.doInBackground(ActionWorker.java:91)\n\tat javax.swing.SwingWorker$1.call(Unknown Source)\n\tat java.util.concurrent.FutureTask.run(Unknown Source)\n\tat javax.swing.SwingWorker.run(Unknown Source)\n\tat java.util.concurrent.ThreadPoolExecutor.runWorker(Unknown Source)\n\tat java.util.concurrent.ThreadPoolExecutor$Worker.run(Unknown Source)\n\tat java.lang.Thread.run(Unknown Source)\nCaused by: org.hibernate.exception.ConstraintViolationException: error executing work\n\tat org.hibernate.exception.internal.SQLStateConversionDelegate.convert(SQLStateConversionDelegate.java:112)\n\tat org.hibernate.exception.internal.StandardSQLExceptionConverter.convert(StandardSQLExceptionConverter.java:42)\n\tat org.hibernate.engine.jdbc.spi.SqlExceptionHelper.convert(SqlExceptionHelper.java:113)\n\tat org.hibernate.engine.jdbc.spi.SqlExceptionHelper.convert(SqlExceptionHelper.java:99)\n\tat org.hibernate.engine.jdbc.internal.JdbcCoordinatorImpl.coordinateWork(JdbcCoordinatorImpl.java:325)\n\tat org.hibernate.internal.SessionImpl.doWork(SessionImpl.java:2448)\n\tat org.hibernate.internal.SessionImpl.doWork(SessionImpl.java:2433)\n\tat org.nuiton.topia.persistence.internal.support.HibernateTopiaSqlSupport.doSqlWork(HibernateTopiaSqlSupport.java:166)\n\t... 19 more\nCaused by: org.h2.jdbc.JdbcBatchUpdateException: Referential integrity constraint violation: \"FK_OCEAN_SPECIES_SPECIES: OBSERVE_COMMON.OCEAN_SPECIES FOREIGN KEY(SPECIES) REFERENCES OBSERVE_COMMON.SPECIES(TOPIAID) (\u0027fr.ird.observe.entities.referentiel.Species#1551868196804#0.09929351272816189\u0027)\"; SQL statement:\nDELETE FROM OBSERVE_COMMON.species WHERE topiaId \u003d \u0027fr.ird.observe.entities.referentiel.Species#1551868196804#0.09929351272816189\u0027;\n [23503-196]\n\tat org.h2.jdbc.JdbcStatement.executeBatch(JdbcStatement.java:688)\n\tat com.zaxxer.hikari.pool.ProxyStatement.executeBatch(ProxyStatement.java:128)\n\tat com.zaxxer.hikari.pool.HikariProxyStatement.executeBatch(HikariProxyStatement.java)\n\tat fr.ird.observe.services.local.service.actions.synchro.referential.sql.ApplySqlRequestWork.flush(ApplySqlRequestWork.java:62)\n\tat fr.ird.observe.services.local.service.actions.synchro.referential.sql.ApplySqlRequestWork.execute(ApplySqlRequestWork.java:57)\n\tat org.nuiton.topia.persistence.internal.support.HibernateTopiaSqlSupport$HibernateTopiaSqlWork.execute(HibernateTopiaSqlSupport.java:91)\n\tat org.hibernate.jdbc.WorkExecutor.executeWork(WorkExecutor.java:37)\n\tat org.hibernate.internal.SessionImpl$1.accept(SessionImpl.java:2429)\n\tat org.hibernate.internal.SessionImpl$1.accept(SessionImpl.java:2426)\n\tat org.hibernate.engine.jdbc.internal.JdbcCoordinatorImpl.coordinateWork(JdbcCoordinatorImpl.java:320)\n\t... 22 more\n```\n\nIl semble donc que l\u0027application oublie de supprimer les associations espèce/océan avant de tenter de supprimer l\u0027espèce.\n\nLa base est celle-ci : [obstuna-local-2019-05-09--14-14-16-issue-species-DYL.sql.gz](/uploads/cc2236a31941ada3891b066ed0ef433e/obstuna-local-2019-05-09--14-14-16-issue-species-DYL.sql.gz)\n\nNote : Dans cette archive l\u0027espèce DYL n\u0027est plus utilisée par la marée, mais reste présente dans le référentiel, de même que son association à un océan.\n\nNote : Les espèces peuvent aussi être listées dans les tables suivantes :\n* OBSERVE_COMMON.OCEAN_SPECIES [cas vu ci-dessus]\n* OBSERVE_COMMON.SPECIES_SPECIESLIST\n* OBSERVE_COMMON.LENGTHLENGTHPARAMETER\n* OBSERVE_COMMON.LENGTHWEIGHTPARAMETER\nIl faut s\u0027assurer que le code gère bien le désenregistrement de l\u0027espèce dans toutes ces tables avant de supprimer l\u0027espèce elle-même.", + "labels": [ + "Anomalie", + "Haut" + ], "milestone": { "id": 866537, "iid": 140, @@ -13,26 +16,27 @@ "groupId": 0, "title": "7.0.7", "description": "", + "dueDate": "May 13, 2019 2:00:00 AM", "startDate": "May 6, 2019 2:00:00 AM", - "state": "active" + "state": "closed" }, "assignees": [ { - "_id": 1111318, - "_username": "pcauquil", - "_name": "Pascal Cauquil", + "_id": 166231, + "_username": "tchemit", + "_name": "Tony CHEMIT", "_state": "active", "_external": false, - "_avatarUrl": "https://secure.gravatar.com/avatar/b4ae117bd93e10d96298fa4d885208ea?s\u003d…" + "_avatarUrl": "https://secure.gravatar.com/avatar/2a915aa9a1df35c8b609ff2f750d5dac?s\u003d…" } ], "assignee": { - "_id": 1111318, - "_username": "pcauquil", - "_name": "Pascal Cauquil", + "_id": 166231, + "_username": "tchemit", + "_name": "Tony CHEMIT", "_state": "active", "_external": false, - "_avatarUrl": "https://secure.gravatar.com/avatar/b4ae117bd93e10d96298fa4d885208ea?s\u003d…" + "_avatarUrl": "https://secure.gravatar.com/avatar/2a915aa9a1df35c8b609ff2f750d5dac?s\u003d…" }, "author": { "_id": 1111318, @@ -45,14 +49,16 @@ "userNotesCount": 2, "upVotes": 0, "downVotes": 0, - "confidential": false, + "confidential": true, + "discussionLocked": true, "timeStats": { "timeEstimate": 0, "totalTimeSpent": 0 }, - "state": "opened", - "updatedAt": "May 6, 2019 1:46:46 PM", - "createdAt": "Apr 15, 2019 6:27:13 PM", - "webUrl": "https://gitlab.com/ultreiaio/ird-observe/issues/1269" + "state": "closed", + "updatedAt": "May 13, 2019 5:36:15 PM", + "createdAt": "May 9, 2019 2:20:56 PM", + "closedAt": "May 13, 2019 2:26:10 PM", + "webUrl": "https://gitlab.com/ultreiaio/ird-observe/issues/1270" } ] \ No newline at end of file ===================================== .mvn/gitlab-cache/milestones/866537.json ===================================== @@ -5,6 +5,7 @@ "groupId": 0, "title": "7.0.7", "description": "", + "dueDate": "May 13, 2019 2:00:00 AM", "startDate": "May 6, 2019 2:00:00 AM", - "state": "active" + "state": "closed" } \ No newline at end of file ===================================== .mvn/gitlab-cache/milestones/873393-issues.json ===================================== @@ -0,0 +1,115 @@ +[ + { + "id": 20731753, + "iid": 1271, + "projectId": 2722779, + "title": "[SYNCHRO SIMPLE] Le référentiel SPECIESGROUP_SPECIESGROUPRELEASEMODE n\u0027est pas mis à jour", + "description": "Dans une base locale, en mode serveur embarqué, on supprime le contenu de la table OBSERVE_COMMON.SPECIESGROUP_SPECIESGROUPRELEASEMODE (les couples groupe d\u0027espèce/mode de libération disponible).\n\nOn réalise une synchro simple depuis un service web.\n\nLa table OBSERVE_COMMON.SPECIESGROUP_SPECIESGROUPRELEASEMODE reste vide.", + "labels": [ + "Anomalie", + "Haut" + ], + "milestone": { + "id": 873393, + "iid": 141, + "projectId": 2722779, + "groupId": 0, + "title": "L.T.S 7.x", + "description": "This milestone should contains any feature or bug to fix in version 7.x", + "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": 1, + "upVotes": 0, + "downVotes": 0, + "confidential": false, + "timeStats": { + "timeEstimate": 0, + "totalTimeSpent": 0 + }, + "state": "opened", + "updatedAt": "May 13, 2019 3:09:30 PM", + "createdAt": "May 9, 2019 4:06:41 PM", + "webUrl": "https://gitlab.com/ultreiaio/ird-observe/issues/1271" + }, + { + "id": 20078138, + "iid": 1269, + "projectId": 2722779, + "title": "[TREE] Parfois un affichage tronqué sans raison", + "description": "Vu avec la v7.0.5 et v7.0.6 :\n\n![image](/uploads/0340bff3be051a10bfbbd47cbc312230/image.png)\n\n![image](/uploads/4c6f4de473bae2e152345b780d43fac6/image.png)", + "labels": [], + "milestone": { + "id": 873393, + "iid": 141, + "projectId": 2722779, + "groupId": 0, + "title": "L.T.S 7.x", + "description": "This milestone should contains any feature or bug to fix in version 7.x", + "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": "opened", + "updatedAt": "May 13, 2019 3:10:22 PM", + "createdAt": "Apr 15, 2019 6:27:13 PM", + "webUrl": "https://gitlab.com/ultreiaio/ird-observe/issues/1269" + } +] \ No newline at end of file ===================================== .mvn/gitlab-cache/milestones/873393.json ===================================== @@ -0,0 +1,9 @@ +{ + "id": 873393, + "iid": 141, + "projectId": 2722779, + "groupId": 0, + "title": "L.T.S 7.x", + "description": "This milestone should contains any feature or bug to fix in version 7.x", + "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-06 13:50. + * Last generated at 2019-05-14 00:13. ## 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. @@ -113,6 +113,17 @@ Premier lot du contrat IRD-2018-01-V8 * [[Evolution 922]](https://gitlab.com/ultreiaio/ird-observe/issues/922) **Ajoute le référentiel observe_common.DataQuality sur les données existantes** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) * [[Evolution 950]](https://gitlab.com/ultreiaio/ird-observe/issues/950) **Renommage de la classe seine.WeightCategory en seine.WeightCategorySeine** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) +## Version [7.0.7](https://gitlab.com/ultreiaio/ird-observe/milestones/140) + +**Closed at 2019-05-13.** + +### Download +* [Application (observe-7.0.7.zip)](http://repo1.maven.org/maven2/fr/ird/observe/observe/7.…) +* [Serveur (observe-7.0.7.war)](http://repo1.maven.org/maven2/fr/ird/observe/observe/7.…) + +### Issues + * [[Anomalie 1270]](https://gitlab.com/ultreiaio/ird-observe/issues/1270) **[SYNCHRO SIMPLE] Une requête DELETE échoue pour cause de violation de contrainte FK** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + ## Version [7.0.6](https://gitlab.com/ultreiaio/ird-observe/milestones/137) **Closed at 2019-04-11.** View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/2808ba1bf555cb174a9526b8885… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/2808ba1bf555cb174a9526b8885… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][pages] Site checkin for project ObServe :: Pom
by Tony CHEMIT 13 May '19

13 May '19

Tony CHEMIT pushed to branch pages at ultreiaio / ird-observe Commits: 110df531 by 166231 at 2019-05-13T19:13:09Z Site checkin for project ObServe :: Pom - - - - - 5 changed files: - administration-web.html - architecture-logicielle.html - index.html - install-serverPG.html - install.html Changes: ===================================== administration-web.html ===================================== @@ -1,13 +1,13 @@ <!DOCTYPE html>  <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="fr" lang="fr"> <head> <meta charset="UTF-8" /> <meta name="viewport" content="width=device-width, initial-scale=1.0" /> - <meta name="Date-Revision-yyyymmdd" content="20190506" /> + <meta name="Date-Revision-yyyymmdd" content="20190513" /> <meta http-equiv="Content-Language" content="fr" /> <title>ObServe :: Pom – Installation de lapplication web</title> <link rel="stylesheet" href="./css/apache-maven-fluido-1.7.min.css" /> @@ -27,8 +27,8 @@ <ul class="breadcrumb"> <li class=""><a href="https://ultreiaio.gitlab.io/ird-observe/index.html" class="externalLink" title="ObServe :: Pom">ObServe :: Pom</a>»</li> <li class="active ">Installation de lapplication web</li> - <li id="publishDate" class="pull-right">| Dernière publication: 2019-05-06</li> - <li id="projectVersion" class="pull-right">|Version: 7.0.6</li> + <li id="publishDate" class="pull-right">| Dernière publication: 2019-05-13</li> + <li id="projectVersion" class="pull-right">|Version: 7.0.7</li> <li class="pull-right">| <a href="http://ultreia.io" class="externalLink" title="Ultreia.io">Ultreia.io</a></li> <li class="pull-right"><a href="https://gitlab.com/ultreiaio/ird-observe" class="externalLink" title="GitLab">GitLab</a></li> @@ -101,7 +101,7 @@ <pre class="source"> /var/local/observeweb/{contextPath} |-- databases.yml # configuration des bases de données |-- log - | `-- observeweb-7.0.6.log # logs de l'application + | `-- observeweb-7.0.7.log # logs de l'application |-- observeweb-log4j2.xml # configuration des logs |-- temp # répertoire temporaire `-- users.yml # configuration des utilisateurs ===================================== architecture-logicielle.html ===================================== @@ -1,13 +1,13 @@ <!DOCTYPE html>  <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="fr" lang="fr"> <head> <meta charset="UTF-8" /> <meta name="viewport" content="width=device-width, initial-scale=1.0" /> - <meta name="Date-Revision-yyyymmdd" content="20190506" /> + <meta name="Date-Revision-yyyymmdd" content="20190513" /> <meta http-equiv="Content-Language" content="fr" /> <title>ObServe :: Pom – Architecture logicielle dObServe</title> <link rel="stylesheet" href="./css/apache-maven-fluido-1.7.min.css" /> @@ -27,8 +27,8 @@ <ul class="breadcrumb"> <li class=""><a href="https://ultreiaio.gitlab.io/ird-observe/index.html" class="externalLink" title="ObServe :: Pom">ObServe :: Pom</a>»</li> <li class="active ">Architecture logicielle dObServe</li> - <li id="publishDate" class="pull-right">| Dernière publication: 2019-05-06</li> - <li id="projectVersion" class="pull-right">|Version: 7.0.6</li> + <li id="publishDate" class="pull-right">| Dernière publication: 2019-05-13</li> + <li id="projectVersion" class="pull-right">|Version: 7.0.7</li> <li class="pull-right">| <a href="http://ultreia.io" class="externalLink" title="Ultreia.io">Ultreia.io</a></li> <li class="pull-right"><a href="https://gitlab.com/ultreiaio/ird-observe" class="externalLink" title="GitLab">GitLab</a></li> ===================================== index.html ===================================== @@ -1,13 +1,13 @@ <!DOCTYPE html>  <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="fr" lang="fr"> <head> <meta charset="UTF-8" /> <meta name="viewport" content="width=device-width, initial-scale=1.0" /> - <meta name="Date-Revision-yyyymmdd" content="20190506" /> + <meta name="Date-Revision-yyyymmdd" content="20190513" /> <meta http-equiv="Content-Language" content="fr" /> <title>ObServe :: Pom – ObServe</title> <link rel="stylesheet" href="./css/apache-maven-fluido-1.7.min.css" /> @@ -27,8 +27,8 @@ <ul class="breadcrumb"> <li class=""><a href="https://ultreiaio.gitlab.io/ird-observe/index.html" class="externalLink" title="ObServe :: Pom">ObServe :: Pom</a>»</li> <li class="active ">ObServe</li> - <li id="publishDate" class="pull-right">| Dernière publication: 2019-05-06</li> - <li id="projectVersion" class="pull-right">|Version: 7.0.6</li> + <li id="publishDate" class="pull-right">| Dernière publication: 2019-05-13</li> + <li id="projectVersion" class="pull-right">|Version: 7.0.7</li> <li class="pull-right">| <a href="http://ultreia.io" class="externalLink" title="Ultreia.io">Ultreia.io</a></li> <li class="pull-right"><a href="https://gitlab.com/ultreiaio/ird-observe" class="externalLink" title="GitLab">GitLab</a></li> ===================================== install-serverPG.html ===================================== @@ -1,13 +1,13 @@ <!DOCTYPE html>  <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="fr" lang="fr"> <head> <meta charset="UTF-8" /> <meta name="viewport" content="width=device-width, initial-scale=1.0" /> - <meta name="Date-Revision-yyyymmdd" content="20190506" /> + <meta name="Date-Revision-yyyymmdd" content="20190513" /> <meta http-equiv="Content-Language" content="fr" /> <title>ObServe :: Pom – Installation du serveur Obstuna</title> <link rel="stylesheet" href="./css/apache-maven-fluido-1.7.min.css" /> @@ -27,8 +27,8 @@ <ul class="breadcrumb"> <li class=""><a href="https://ultreiaio.gitlab.io/ird-observe/index.html" class="externalLink" title="ObServe :: Pom">ObServe :: Pom</a>»</li> <li class="active ">Installation du serveur Obstuna</li> - <li id="publishDate" class="pull-right">| Dernière publication: 2019-05-06</li> - <li id="projectVersion" class="pull-right">|Version: 7.0.6</li> + <li id="publishDate" class="pull-right">| Dernière publication: 2019-05-13</li> + <li id="projectVersion" class="pull-right">|Version: 7.0.7</li> <li class="pull-right">| <a href="http://ultreia.io" class="externalLink" title="Ultreia.io">Ultreia.io</a></li> <li class="pull-right"><a href="https://gitlab.com/ultreiaio/ird-observe" class="externalLink" title="GitLab">GitLab</a></li> ===================================== install.html ===================================== @@ -1,13 +1,13 @@ <!DOCTYPE html>  <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="fr" lang="fr"> <head> <meta charset="UTF-8" /> <meta name="viewport" content="width=device-width, initial-scale=1.0" /> - <meta name="Date-Revision-yyyymmdd" content="20190506" /> + <meta name="Date-Revision-yyyymmdd" content="20190513" /> <meta http-equiv="Content-Language" content="fr" /> <title>ObServe :: Pom – Installation dObServe</title> <link rel="stylesheet" href="./css/apache-maven-fluido-1.7.min.css" /> @@ -27,8 +27,8 @@ <ul class="breadcrumb"> <li class=""><a href="https://ultreiaio.gitlab.io/ird-observe/index.html" class="externalLink" title="ObServe :: Pom">ObServe :: Pom</a>»</li> <li class="active ">Installation dObServe</li> - <li id="publishDate" class="pull-right">| Dernière publication: 2019-05-06</li> - <li id="projectVersion" class="pull-right">|Version: 7.0.6</li> + <li id="publishDate" class="pull-right">| Dernière publication: 2019-05-13</li> + <li id="projectVersion" class="pull-right">|Version: 7.0.7</li> <li class="pull-right">| <a href="http://ultreia.io" class="externalLink" title="Ultreia.io">Ultreia.io</a></li> <li class="pull-right"><a href="https://gitlab.com/ultreiaio/ird-observe" class="externalLink" title="GitLab">GitLab</a></li> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/110df53181ca91a3122395c1e3b… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/110df53181ca91a3122395c1e3b… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe] Deleted branch release/7.0.7
by Tony CHEMIT 13 May '19

13 May '19

Tony CHEMIT deleted branch release/7.0.7 at ultreiaio / ird-observe -- You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe] Pushed new tag v7.0.7
by Tony CHEMIT 13 May '19

13 May '19

Tony CHEMIT pushed new tag v7.0.7 at ultreiaio / ird-observe -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/tree/v7.0.7 You're receiving this email because of your account on gitlab.com.

1 0