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

[Git][ultreiaio/ird-observe][develop] 5 commits: Editeurs d'url non actifs - Closes #1275
by Tony CHEMIT 21 May '19

21 May '19

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 9857e601 by tchemit at 2019-05-21T09:30:58Z Editeurs d'url non actifs - Closes #1275 - - - - - c34fdc68 by tchemit at 2019-05-21T09:31:00Z update templates - - - - - 842bb48c by tchemit at 2019-05-21T09:31:00Z Impossible d'éditer nouveau DCP - Closes #1279 - - - - - 96034c18 by tchemit at 2019-05-21T09:31:00Z Pas d'accès à l'activité de fin de veille - Closes #1281 - - - - - cb1af8b5 by tchemit at 2019-05-21T09:31:00Z Ajout d'un test pour mieux comprendre le pb - Erreur création activité - See #1283 - - - - - 8 changed files: - .gitlab/issue_templates/Contrat-SFA-2017-Anomalie.md - .gitlab/issue_templates/Contrat-SFA-2017-Evolution.md - client-core/src/main/java/fr/ird/observe/client/navigation/RouteCloseCallback.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/content/api/data/open/CloseOpenDataUIAction.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ps/save/SaveFloatingObjectSeineUIAction.java - client-core/src/main/java/fr/ird/observe/client/ui/util/ObserveValidatorMessageTableRenderer.java - dto/src/main/java/fr/ird/observe/dto/referential/ps/observation/ObjectMaterialDto.java - pom.xml Changes: ===================================== .gitlab/issue_templates/Contrat-SFA-2017-Anomalie.md ===================================== @@ -9,6 +9,6 @@ ``` /label ~"Anomalie" -/label ~"Contrat SFA-2017" -/milestone %"Contrat SFA-2017" +/label ~"IRD-2018-01-V8" +/milestone %"8.0-beta-1" /assign @tchemit \ No newline at end of file ===================================== .gitlab/issue_templates/Contrat-SFA-2017-Evolution.md ===================================== @@ -1,5 +1,5 @@ /label ~"Evolution" -/label ~"Contrat SFA-2017" +/label ~"IRD-2018-01-V8" /milestone %"Contrat SFA-2017" /assign @tchemit \ No newline at end of file ===================================== client-core/src/main/java/fr/ird/observe/client/navigation/RouteCloseCallback.java ===================================== @@ -129,7 +129,7 @@ public class RouteCloseCallback implements ObserveEditNodeCloseCallback { // on selection l'activity de fin de veille et on y reste // donc on ne continue pas la fermeture de la route - throw new CloseEditNodeVetoException("Fermeture abandonnée! TODO Ajouter message plus explicite.", node); + throw new CloseEditNodeVetoException("Fermeture de la route abandonnée (création d'une activité de fin de veille en cours)", node); } } @@ -139,7 +139,7 @@ public class RouteCloseCallback implements ObserveEditNodeCloseCallback { MutableTreeNode routeNode = tree.select(node).orElseThrow(() -> new IllegalStateException("Can't find route node")); - MultipleReferenceContainerNode<ActivitySeineDto, ActivitySeineReference> parentNode = MultipleReferenceContainerNode.upToReferenceContainerNode(ActivitySeineReference.class, routeNode); + MultipleReferenceContainerNode<ActivitySeineDto, ActivitySeineReference> parentNode = MultipleReferenceContainerNode.downToReferenceContainerNode(ActivitySeineReference.class, routeNode); tree.selectSafeNode(parentNode); log.debug("PARENT NODE = " + parentNode); ===================================== client-core/src/main/java/fr/ird/observe/client/ui/actions/content/api/data/open/CloseOpenDataUIAction.java ===================================== @@ -102,7 +102,8 @@ public class CloseOpenDataUIAction extends AbstractContentUIAction { //FIXME See what does it means ? getMainUI().getHandler().updateContentSize(); } catch (CloseEditNodeVetoException e1) { - UIHelper.handlingError(e1); + log.error("Could not close data from callback", e1); +// UIHelper.handlingError(e1); } } ===================================== client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ps/save/SaveFloatingObjectSeineUIAction.java ===================================== @@ -28,13 +28,19 @@ import fr.ird.observe.client.ui.ObserveMainUI; import fr.ird.observe.client.ui.actions.content.api.data.edit.SaveEditDataUIActionSupport; import fr.ird.observe.client.ui.content.data.ps.observation.FloatingObjectUI; import fr.ird.observe.client.ui.content.data.ps.observation.FloatingObjectUIModel; +import fr.ird.observe.client.ui.tree.navigation.nodes.NavigationTreeNodeSupport; import fr.ird.observe.dto.data.ps.observation.FloatingObjectDto; import fr.ird.observe.dto.data.ps.observation.FloatingObjectPartDto; import fr.ird.observe.dto.data.ps.observation.FloatingObjectReference; import fr.ird.observe.dto.result.SaveResultDto; import fr.ird.observe.navigation.model.edit.ObserveEditNode; +import fr.ird.observe.navigation.tree.MultipleReferenceContainerNode; +import fr.ird.observe.navigation.tree.ReferenceNode; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.jetbrains.annotations.NotNull; + +import java.util.function.Function; /** * Created by tchemit on 28/09/2018. @@ -68,4 +74,8 @@ public class SaveFloatingObjectSeineUIAction extends SaveEditDataUIActionSupport return true; } + @Override + protected @NotNull Function<FloatingObjectReference, ReferenceNode<FloatingObjectDto, FloatingObjectReference>> getNodeFactory(NavigationTreeNodeSupport parent) { + return ((MultipleReferenceContainerNode) parent)::newChildNode; + } } ===================================== client-core/src/main/java/fr/ird/observe/client/ui/util/ObserveValidatorMessageTableRenderer.java ===================================== @@ -36,6 +36,7 @@ import javax.swing.JComponent; import javax.swing.JTable; import java.awt.Color; import java.awt.Component; +import java.util.Objects; import static io.ultreia.java4all.i18n.I18n.t; @@ -59,6 +60,7 @@ public class ObserveValidatorMessageTableRenderer extends SwingValidatorMessageT @Override public String getFieldName(JTable table, String value, int row) { + Objects.requireNonNull(value,"Value can not be null!"); SwingValidatorMessageTableModel tableModel = (SwingValidatorMessageTableModel) table.getModel(); SwingValidatorMessage model = tableModel.getRow(row); JComponent editor = model.getEditor(); ===================================== dto/src/main/java/fr/ird/observe/dto/referential/ps/observation/ObjectMaterialDto.java ===================================== @@ -29,19 +29,19 @@ public class ObjectMaterialDto extends GeneratedObjectMaterialDto { private static final long serialVersionUID = 1L; //FIXME-PROTECTED-ID public boolean isBoolean() { - return objectMaterialType != null && " fr.ird.referential.ps.ObjectMaterialType#0#0".equals(objectMaterialType.getId()); + return objectMaterialType != null && "fr.ird.referential.ps.observation.ObjectMaterialType#0#0".equals(objectMaterialType.getId()); } //FIXME-PROTECTED-ID public boolean isText() { - return objectMaterialType != null && " fr.ird.referential.ps.ObjectMaterialType#0#3".equals(objectMaterialType.getId()); + return objectMaterialType != null && "fr.ird.referential.ps.observation.ObjectMaterialType#0#3".equals(objectMaterialType.getId()); } //FIXME-PROTECTED-ID public boolean isInteger() { - return objectMaterialType != null && " fr.ird.referential.ps.ObjectMaterialType#0#2".equals(objectMaterialType.getId()); + return objectMaterialType != null && "fr.ird.referential.ps.observation.ObjectMaterialType#0#2".equals(objectMaterialType.getId()); } //FIXME-PROTECTED-ID public boolean isFloat() { - return objectMaterialType != null && " fr.ird.referential.ps.ObjectMaterialType#0#1".equals(objectMaterialType.getId()); + return objectMaterialType != null && "fr.ird.referential.ps.observation.ObjectMaterialType#0#1".equals(objectMaterialType.getId()); } public boolean withValidation() { ===================================== pom.xml ===================================== @@ -163,7 +163,7 @@   - + <lib.version.java4all.jaxx>3.0-alpha-51</lib.version.java4all.jaxx>    View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/1be1078f4bf849d0ee48e093c7… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/1be1078f4bf849d0ee48e093c7… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Ajout d'un test pour mieux comprendre le pb - Erreur création activité - See #1283
by Tony CHEMIT 21 May '19

21 May '19

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 1be1078f by tchemit at 2019-05-21T09:16:03Z Ajout d'un test pour mieux comprendre le pb - Erreur création activité - See #1283 - - - - - 1 changed file: - client-core/src/main/java/fr/ird/observe/client/ui/util/ObserveValidatorMessageTableRenderer.java Changes: ===================================== client-core/src/main/java/fr/ird/observe/client/ui/util/ObserveValidatorMessageTableRenderer.java ===================================== @@ -36,6 +36,7 @@ import javax.swing.JComponent; import javax.swing.JTable; import java.awt.Color; import java.awt.Component; +import java.util.Objects; import static io.ultreia.java4all.i18n.I18n.t; @@ -59,6 +60,7 @@ public class ObserveValidatorMessageTableRenderer extends SwingValidatorMessageT @Override public String getFieldName(JTable table, String value, int row) { + Objects.requireNonNull(value,"Value can not be null!"); SwingValidatorMessageTableModel tableModel = (SwingValidatorMessageTableModel) table.getModel(); SwingValidatorMessage model = tableModel.getRow(row); JComponent editor = model.getEditor(); View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/1be1078f4bf849d0ee48e093c73… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/1be1078f4bf849d0ee48e093c73… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Pas d'accès à l'activité de fin de veille - Closes #1281
by Tony CHEMIT 21 May '19

21 May '19

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: a4430687 by tchemit at 2019-05-21T09:06:40Z Pas d'accès à l'activité de fin de veille - Closes #1281 - - - - - 2 changed files: - client-core/src/main/java/fr/ird/observe/client/navigation/RouteCloseCallback.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/content/api/data/open/CloseOpenDataUIAction.java Changes: ===================================== client-core/src/main/java/fr/ird/observe/client/navigation/RouteCloseCallback.java ===================================== @@ -129,7 +129,7 @@ public class RouteCloseCallback implements ObserveEditNodeCloseCallback { // on selection l'activity de fin de veille et on y reste // donc on ne continue pas la fermeture de la route - throw new CloseEditNodeVetoException("Fermeture abandonnée! TODO Ajouter message plus explicite.", node); + throw new CloseEditNodeVetoException("Fermeture de la route abandonnée (création d'une activité de fin de veille en cours)", node); } } @@ -139,7 +139,7 @@ public class RouteCloseCallback implements ObserveEditNodeCloseCallback { MutableTreeNode routeNode = tree.select(node).orElseThrow(() -> new IllegalStateException("Can't find route node")); - MultipleReferenceContainerNode<ActivitySeineDto, ActivitySeineReference> parentNode = MultipleReferenceContainerNode.upToReferenceContainerNode(ActivitySeineReference.class, routeNode); + MultipleReferenceContainerNode<ActivitySeineDto, ActivitySeineReference> parentNode = MultipleReferenceContainerNode.downToReferenceContainerNode(ActivitySeineReference.class, routeNode); tree.selectSafeNode(parentNode); log.debug("PARENT NODE = " + parentNode); ===================================== client-core/src/main/java/fr/ird/observe/client/ui/actions/content/api/data/open/CloseOpenDataUIAction.java ===================================== @@ -102,7 +102,8 @@ public class CloseOpenDataUIAction extends AbstractContentUIAction { //FIXME See what does it means ? getMainUI().getHandler().updateContentSize(); } catch (CloseEditNodeVetoException e1) { - UIHelper.handlingError(e1); + log.error("Could not close data from callback", e1); +// UIHelper.handlingError(e1); } } View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/a4430687baa9a077ce0b05bd8c2… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/a4430687baa9a077ce0b05bd8c2… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Impossible d'éditer nouveau DCP - Closes #1279
by Tony CHEMIT 21 May '19

21 May '19

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 63734157 by tchemit at 2019-05-21T08:56:21Z Impossible d'éditer nouveau DCP - Closes #1279 - - - - - 2 changed files: - client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ps/save/SaveFloatingObjectSeineUIAction.java - dto/src/main/java/fr/ird/observe/dto/referential/ps/observation/ObjectMaterialDto.java Changes: ===================================== client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ps/save/SaveFloatingObjectSeineUIAction.java ===================================== @@ -28,13 +28,19 @@ import fr.ird.observe.client.ui.ObserveMainUI; import fr.ird.observe.client.ui.actions.content.api.data.edit.SaveEditDataUIActionSupport; import fr.ird.observe.client.ui.content.data.ps.observation.FloatingObjectUI; import fr.ird.observe.client.ui.content.data.ps.observation.FloatingObjectUIModel; +import fr.ird.observe.client.ui.tree.navigation.nodes.NavigationTreeNodeSupport; import fr.ird.observe.dto.data.ps.observation.FloatingObjectDto; import fr.ird.observe.dto.data.ps.observation.FloatingObjectPartDto; import fr.ird.observe.dto.data.ps.observation.FloatingObjectReference; import fr.ird.observe.dto.result.SaveResultDto; import fr.ird.observe.navigation.model.edit.ObserveEditNode; +import fr.ird.observe.navigation.tree.MultipleReferenceContainerNode; +import fr.ird.observe.navigation.tree.ReferenceNode; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.jetbrains.annotations.NotNull; + +import java.util.function.Function; /** * Created by tchemit on 28/09/2018. @@ -68,4 +74,8 @@ public class SaveFloatingObjectSeineUIAction extends SaveEditDataUIActionSupport return true; } + @Override + protected @NotNull Function<FloatingObjectReference, ReferenceNode<FloatingObjectDto, FloatingObjectReference>> getNodeFactory(NavigationTreeNodeSupport parent) { + return ((MultipleReferenceContainerNode) parent)::newChildNode; + } } ===================================== dto/src/main/java/fr/ird/observe/dto/referential/ps/observation/ObjectMaterialDto.java ===================================== @@ -29,19 +29,19 @@ public class ObjectMaterialDto extends GeneratedObjectMaterialDto { private static final long serialVersionUID = 1L; //FIXME-PROTECTED-ID public boolean isBoolean() { - return objectMaterialType != null && " fr.ird.referential.ps.ObjectMaterialType#0#0".equals(objectMaterialType.getId()); + return objectMaterialType != null && "fr.ird.referential.ps.observation.ObjectMaterialType#0#0".equals(objectMaterialType.getId()); } //FIXME-PROTECTED-ID public boolean isText() { - return objectMaterialType != null && " fr.ird.referential.ps.ObjectMaterialType#0#3".equals(objectMaterialType.getId()); + return objectMaterialType != null && "fr.ird.referential.ps.observation.ObjectMaterialType#0#3".equals(objectMaterialType.getId()); } //FIXME-PROTECTED-ID public boolean isInteger() { - return objectMaterialType != null && " fr.ird.referential.ps.ObjectMaterialType#0#2".equals(objectMaterialType.getId()); + return objectMaterialType != null && "fr.ird.referential.ps.observation.ObjectMaterialType#0#2".equals(objectMaterialType.getId()); } //FIXME-PROTECTED-ID public boolean isFloat() { - return objectMaterialType != null && " fr.ird.referential.ps.ObjectMaterialType#0#1".equals(objectMaterialType.getId()); + return objectMaterialType != null && "fr.ird.referential.ps.observation.ObjectMaterialType#0#1".equals(objectMaterialType.getId()); } public boolean withValidation() { View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/63734157250fb8d534899af3f7d… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/63734157250fb8d534899af3f7d… You're receiving this email because of your account on gitlab.com.

1 0

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

20 May '19

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 0858ceeb by tchemit at 2019-05-20T17:29:42Z update templates - - - - - 2 changed files: - .gitlab/issue_templates/Contrat-SFA-2017-Anomalie.md - .gitlab/issue_templates/Contrat-SFA-2017-Evolution.md Changes: ===================================== .gitlab/issue_templates/Contrat-SFA-2017-Anomalie.md ===================================== @@ -9,6 +9,6 @@ ``` /label ~"Anomalie" -/label ~"Contrat SFA-2017" -/milestone %"Contrat SFA-2017" +/label ~"IRD-2018-01-V8" +/milestone %"8.0-beta-1" /assign @tchemit \ No newline at end of file ===================================== .gitlab/issue_templates/Contrat-SFA-2017-Evolution.md ===================================== @@ -1,5 +1,5 @@ /label ~"Evolution" -/label ~"Contrat SFA-2017" +/label ~"IRD-2018-01-V8" /milestone %"Contrat SFA-2017" /assign @tchemit \ No newline at end of file View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/0858ceeb4051a725cea28105f75… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/0858ceeb4051a725cea28105f75… You're receiving this email because of your account on gitlab.com.

1 0

[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