From gitlab@mg.gitlab.com Tue Feb 9 13:15:07 2021 From: Tony CHEMIT To: observe-commits@list.forge.codelutin.com Subject: [Observe-commits] [Git][ultreiaio/ird-observe][develop] 3 commits: =?utf-8?q?Probl=C3=A8me?= de sauvegardes des =?utf-8?q?=C3=A9chantillons?= - Closes #1780 Date: Tue, 09 Feb 2021 12:14:55 +0000 Message-ID: <60227cbfee34e_b542004408f8@gitlab-sidekiq-low-urgency-cpu-bound-v1-695b7c75fc-b527j.mail> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============3112907226918082559==" --===============3112907226918082559== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: cd0ea9b3 by Tony Chemit at 2021-02-09T09:59:46+01:00 Probl=C3=A8me de sauvegardes des =C3=A9chantillons - Closes #1780 - - - - - 2ee01f5d by Tony Chemit at 2021-02-09T13:06:54+01:00 Mauvaise disposition de l'encadr=C3=A9 des esp=C3=A8ces et quelques am= =C3=A9liorations sur les deux =C3=A9crans - See #1781 - - - - - 3af924ab by Tony Chemit at 2021-02-09T13:13:50+01:00 On en voit plus les DCP! - See #1782 - - - - - 9 changed files: - client/datasource/editor/api/src/main/resources/fr/ird/observe/client/datas= ource/editor/api/content/data/sample/CommonSample.jcss - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/= editor/ps/data/observation/DiscardedTargetSampleUI.jaxx - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/= editor/ps/data/observation/DiscardedTargetSampleUIHandler.java - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/= editor/ps/data/observation/KeptTargetSampleUI.jaxx - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/= editor/ps/data/observation/KeptTargetSampleUIHandler.java - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/= editor/ps/data/observation/NonTargetSampleUI.jaxx - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/= editor/ps/data/observation/NonTargetSampleUIHandler.java - pom.xml - services/local-impl/src/main/java/fr/ird/observe/services/local/service/dat= a/ps/observation/SampleDataServiceLocalSupport.java Changes: =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D client/datasource/editor/api/src/main/resources/fr/ird/observe/client/datasou= rce/editor/api/content/data/sample/CommonSample.jcss =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D @@ -25,7 +25,7 @@ } =20 #acquisitionModePanel { - border:{new TitledBorder(t("observe.data.Data.acquisitionMode"))}; + border:{new TitledBorder(new javax.swing.border.EmptyBorder(0,0,0,0), t("o= bserve.data.Data.acquisitionMode"))}; } =20 #acquisitionModeNumber { @@ -45,7 +45,7 @@ } =20 #speciesAndMeasureTypesPanel { - border:{new TitledBorder(t("observe.data.Data.speciesAndMeasureTypes"))}; + border:{new TitledBorder(new javax.swing.border.EmptyBorder(0,0,0,0), t("o= bserve.data.Data.speciesAndMeasureTypes"))}; } =20 #sizeMeasureType { =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/ed= itor/ps/data/observation/DiscardedTargetSampleUI.jaxx =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D @@ -70,42 +70,42 @@ =20 - + - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - -
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
=20 @@ -126,18 +126,13 @@ - - - - - - + @@ -150,18 +145,13 @@ - - - - - - + @@ -198,5 +188,7 @@ + + =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/ed= itor/ps/data/observation/DiscardedTargetSampleUIHandler.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D @@ -87,6 +87,8 @@ public class DiscardedTargetSampleUIHandler extends Generat= edDiscardedTargetSamp ui.getAcquisitionModeGroup().addChangeListener(this::onAcquisitionMo= deChanged); ui.getSizeMeasureType().getToolbarRight().add(ui.getDefaultSizeMeasu= reType()); ui.getWeightMeasureType().getToolbarRight().add(ui.getDefaultWeightM= easureType()); + ui.getLength().getRightToolbar().add(ui.getLengthSourceInformation()= ); + ui.getWeight().getRightToolbar().add(ui.getWeightSourceInformation()= ); ResetSizeMeasureType.install(ui, ui.getDefaultSizeMeasureType(), ui.= getSizeMeasureType()); ResetWeightMeasureType.install(ui, ui.getDefaultWeightMeasureType(),= ui.getWeightMeasureType()); } =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/ed= itor/ps/data/observation/KeptTargetSampleUI.jaxx =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D @@ -69,42 +69,42 @@ =20 - + - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - -
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
=20 @@ -125,18 +125,13 @@ - - - - - - + @@ -149,18 +144,13 @@ - - - - - - + @@ -197,5 +187,7 @@ + + =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/ed= itor/ps/data/observation/KeptTargetSampleUIHandler.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D @@ -87,6 +87,8 @@ public class KeptTargetSampleUIHandler extends GeneratedKep= tTargetSampleUIHandle ui.getAcquisitionModeGroup().addChangeListener(this::onAcquisitionMo= deChanged); ui.getSizeMeasureType().getToolbarRight().add(ui.getDefaultSizeMeasu= reType()); ui.getWeightMeasureType().getToolbarRight().add(ui.getDefaultWeightM= easureType()); + ui.getLength().getRightToolbar().add(ui.getLengthSourceInformation()= ); + ui.getWeight().getRightToolbar().add(ui.getWeightSourceInformation()= ); ResetSizeMeasureType.install(ui, ui.getDefaultSizeMeasureType(), ui.= getSizeMeasureType()); ResetWeightMeasureType.install(ui, ui.getDefaultWeightMeasureType(),= ui.getWeightMeasureType()); } =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/ed= itor/ps/data/observation/NonTargetSampleUI.jaxx =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D @@ -71,42 +71,42 @@ =20 - + - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - -
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
=20 @@ -117,12 +117,6 @@ - - - - - =20 @@ -133,19 +127,13 @@ - - - - - - + @@ -175,7 +163,7 @@ - + @@ -212,5 +200,7 @@ + + =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/ed= itor/ps/data/observation/NonTargetSampleUIHandler.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D @@ -85,6 +85,8 @@ public class NonTargetSampleUIHandler extends GeneratedNonT= argetSampleUIHandler ui.getAcquisitionModeGroup().addChangeListener(this::onAcquisitionMo= deChanged); ui.getSizeMeasureType().getToolbarRight().add(ui.getDefaultSizeMeasu= reType()); ui.getWeightMeasureType().getToolbarRight().add(ui.getDefaultWeightM= easureType()); + ui.getLength().getRightToolbar().add(ui.getLengthSourceInformation()= ); + ui.getWeight().getRightToolbar().add(ui.getWeightSourceInformation()= ); ResetSizeMeasureType.install(ui, ui.getDefaultSizeMeasureType(), ui.= getSizeMeasureType()); ResetWeightMeasureType.install(ui, ui.getDefaultWeightMeasureType(),= ui.getWeightMeasureType()); } =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D @@ -147,7 +147,7 @@ dd/MM/yyyy HH:mm z ${maven.build.timestamp} =20 - 5.0.1 + 5.0.2-SNAPSHOT =20 3.1.28 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D services/local-impl/src/main/java/fr/ird/observe/services/local/service/data/= ps/observation/SampleDataServiceLocalSupport.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D @@ -61,13 +61,14 @@ public abstract class SampleDataServiceLocalSupport