From gitlab@mg.gitlab.com Wed Jan 4 16:07:34 2023
From: "Tony CHEMIT (@tchemit)"
To: observe-commits@list.forge.codelutin.com
Subject: [Observe-commits] [Git][ultreiaio/ird-observe][develop-9.0.x] 2
commits: =?utf-8?q?Am=C3=A9lioration?= du texte d'information quand on ne
peut pas encore remplir le...
Date: Wed, 04 Jan 2023 15:07:30 +0000
Message-ID: <63b5963256907_2455e88374f4@gitlab-sidekiq-low-urgency-cpu-bound-v2-7bff8c575c-fmbgz.mail>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============4139090617869328805=="
--===============4139090617869328805==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable
Tony CHEMIT pushed to branch develop-9.0.x at ultreiaio / ird-observe
Commits:
fc4ee4b9 by Tony Chemit at 2023-01-04T15:11:19+01:00
Am=C3=A9lioration du texte d'information quand on ne peut pas encore remp=
lir le march=C3=A9 local - closes #2586
- - - - -
6836cd1c by Tony Chemit at 2023-01-04T16:03:51+01:00
Ajout sur le formulaire d'une information sur la saisie possible ou non d=
u march=C3=A9 local =C3=A0 partir du port d'arriv=C3=A9e s=C3=A9lectionn=
=C3=A9 - closes #2590
- - - - -
14 changed files:
- client/datasource/editor/ps/src/main/i18n/getters/java.getter
- client/datasource/editor/ps/src/main/i18n/templates/checkPsTripLocalMarketA=
cquisitionStatus_en_GB.ftl
- client/datasource/editor/ps/src/main/i18n/templates/checkPsTripLocalMarketA=
cquisitionStatus_es_ES.ftl
- client/datasource/editor/ps/src/main/i18n/templates/checkPsTripLocalMarketA=
cquisitionStatus_fr_FR.ftl
- client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/=
editor/ps/data/common/TripUI.jaxx
- client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/=
editor/ps/data/common/TripUI.jcss
- client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/=
editor/ps/data/common/TripUIModelStates.java
- client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/=
editor/ps/predicates/CheckTripLocalMarketAcquisitionStatus.java
- client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/=
editor/ps/predicates/CheckTripSupport.java
- core/api/dto-decoration/src/main/i18n/getters/labels.getter
- core/services/i18n/src/main/i18n/translations/services_en_GB.properties
- core/services/i18n/src/main/i18n/translations/services_es_ES.properties
- core/services/i18n/src/main/i18n/translations/services_fr_FR.properties
- model/src/main/models/Observe/dto/class/i18nLabels.properties
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/ps/src/main/i18n/getters/java.getter
=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
@@ -6,6 +6,8 @@ observe.Common.whenArriving
observe.Common.whenLeaving
observe.data.Activity.comment2
observe.data.message.will.delete.sub.data
+observe.data.ps.common.Trip.landingHarbour.localMarketNotPossible
+observe.data.ps.common.Trip.landingHarbour.localMarketPossible
observe.data.ps.dcp.FloatingObjectPreset.action.add
observe.data.ps.dcp.FloatingObjectPreset.action.add.tip
observe.data.ps.dcp.FloatingObjectPreset.add.title
=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/i18n/templates/checkPsTripLocalMarketAcq=
uisitionStatus_en_GB.ftl
=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
@@ -20,23 +20,35 @@
- To be able to acquire data of type ${dtoLabel}, the trip form must =
first be completed:
+ To acquire ${dtoLabel} data, the trip form must first be completed:
- - The Local market collection must be filled with a value that in=
dicate presence of data
- - The Logbook and associated data tab must be properly filled
+ - The landing harbour must be filled in
+ - This harbour must have packaging reference data associated with it
+ - The tab named Logbook and associated data must be properly fill=
ed in
+ - The field named Local market collection must be filled in with =
a value that indicates existence of data
- Click on Access to trip form to fill properly the form and save..
+ Click on Access to trip form to fill in properly the form and save.
-The Local market collection widget will be focused in the proper t=
ab.
+
+ If landing harbour is not filled in,
+
+ - Its widget will be focused in the proper tab, to enable you to fill in=
it
+ - Once the landing harbour is provided, you need to fill in the tab name=
d Local market collection in the proper tab
+
+
+
+ If landing harbour is filled in, but doesn't have packaging refe=
rence data associated associated with it, you will not be able to acquire loc=
al market data.
+
+In other cases, the field named Local market collection is focused=
in the proper tab.
- You can then enter the data.
+ You can then acquire ${dtoLabel} data.
=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/i18n/templates/checkPsTripLocalMarketAcq=
uisitionStatus_es_ES.ftl
=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
@@ -21,23 +21,35 @@
#TODO
- To be able to acquire data of type ${dtoLabel}, the trip form must =
first be completed:
+ To acquire ${dtoLabel} data, the trip form must first be completed:
- - The Local market collection must be filled with a value that in=
dicate presence of data
- - The Logbook and associated data tab must be properly filled
+ - The landing harbour must be filled in
+ - This harbour must have packaging reference data associated with it
+ - The tab named Logbook and associated data must be properly fill=
ed in
+ - The field named Local market collection must be filled in with =
a value that indicates existence of data
- Click on Access to trip form to fill properly the form and save..
+ Click on Access to trip form to fill in properly the form and save.
-The Local market collection widget will be focused in the proper t=
ab.
+
+ If landing harbour is not filled in,
+
+ - Its widget will be focused in the proper tab, to enable you to fill in=
it
+ - Once the landing harbour is provided, you need to fill in the tab name=
d Local market collection in the proper tab
+
+
+
+ If landing harbour is filled in, but doesn't have packaging refe=
rence data associated associated with it, you will not be able to acquire loc=
al market data.
+
+In other cases, the field named Local market collection is focused=
in the proper tab.
- You can then enter the data.
+ You can then acquire ${dtoLabel} data.