Skip to content

Commit cf13836

Browse files
authored
Préavis – Correction des étiquettes des status (#3453)
## Linked issues - #3436 ---- - [ ] Tests E2E (Cypress)
2 parents 7434cbf + fd06332 commit cf13836

File tree

5 files changed

+13
-13
lines changed

5 files changed

+13
-13
lines changed

backend/src/main/kotlin/fr/gouv/cnsp/monitorfish/domain/entities/prior_notification/PriorNotificationState.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ enum class PriorNotificationState {
44
/** "Envoi auto. demandé". */
55
AUTO_SEND_REQUESTED,
66

7-
/** "En cours d'envoi auto". */
7+
/** "En cours d'envoi auto.". */
88
AUTO_SEND_IN_PROGRESS,
99

1010
/** "Envoi auto. fait". */
@@ -13,7 +13,7 @@ enum class PriorNotificationState {
1313
/** "Échec de diffusion". */
1414
FAILED_SEND,
1515

16-
/** "Hors vér". */
16+
/** "Hors vérification". */
1717
OUT_OF_VERIFICATION_SCOPE,
1818

1919
/** "En cours de d'envoi auto". */

backend/src/main/kotlin/fr/gouv/cnsp/monitorfish/domain/use_cases/prior_notification/ComputeManualPriorNotification.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,9 @@ class ComputeManualPriorNotification(
4646

4747
val isInVerificationScope = ManualPriorNotificationComputedValues
4848
.isInVerificationScope(vesselFlagCountryCode, vesselRiskFactor)
49-
val isPartOfControlUnitSubscriptions = pnoPortSubscriptionRepository.has(portLocode)
50-
|| pnoVesselSubscriptionRepository.has(vesselId)
51-
|| pnoSegmentSubscriptionRepository.has(portLocode, tripSegments.map { it.segment })
49+
val isPartOfControlUnitSubscriptions = pnoPortSubscriptionRepository.has(portLocode) ||
50+
pnoVesselSubscriptionRepository.has(vesselId) ||
51+
pnoSegmentSubscriptionRepository.has(portLocode, tripSegments.map { it.segment })
5252
val nextState = PriorNotification.getNextState(isInVerificationScope, isPartOfControlUnitSubscriptions)
5353

5454
return ManualPriorNotificationComputedValues(

backend/src/main/kotlin/fr/gouv/cnsp/monitorfish/domain/use_cases/prior_notification/CreateOrUpdateManualPriorNotification.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,9 +55,9 @@ class CreateOrUpdateManualPriorNotification(
5555
vesselId,
5656
)
5757

58-
val isPartOfControlUnitSubscriptions = pnoPortSubscriptionRepository.has(portLocode)
59-
|| pnoVesselSubscriptionRepository.has(vesselId)
60-
|| pnoSegmentSubscriptionRepository.has(portLocode, computedValues.tripSegments.map { it.segment })
58+
val isPartOfControlUnitSubscriptions = pnoPortSubscriptionRepository.has(portLocode) ||
59+
pnoVesselSubscriptionRepository.has(vesselId) ||
60+
pnoSegmentSubscriptionRepository.has(portLocode, computedValues.tripSegments.map { it.segment })
6161

6262
val fishingCatchesWithFaoArea = fishingCatches.map { it.copy(faoZone = faoArea) }
6363
val tripGears = getTripGears(tripGearCodes)

frontend/cypress/e2e/side_window/prior_notification_form/form.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -501,7 +501,7 @@ context('Side Window > Prior Notification Form > Form', () => {
501501
state: PriorNotification.State.OUT_OF_VERIFICATION_SCOPE
502502
})
503503

504-
cy.get('.Element-Tag').contains('Hors diffusion').should('exist')
504+
cy.get('.Element-Tag').contains('Hors vérification').should('exist')
505505

506506
// -----------------------------------------------------------------------
507507
// Verify and send

frontend/src/features/PriorNotification/PriorNotification.types.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -153,13 +153,13 @@ export namespace PriorNotification {
153153
export enum State {
154154
/** "Envoi auto. fait". */
155155
AUTO_SEND_DONE = 'AUTO_SEND_DONE',
156-
/** "En cours d'envoi auto". */
156+
/** "En cours d'envoi auto.". */
157157
AUTO_SEND_IN_PROGRESS = 'AUTO_SEND_IN_PROGRESS',
158158
/** "Envoi auto. demandé". */
159159
AUTO_SEND_REQUESTED = 'AUTO_SEND_REQUESTED',
160160
/** "Échec de diffusion". */
161161
FAILED_SEND = 'FAILED_SEND',
162-
/** "Hors diffusion". */
162+
/** "Hors vérification". */
163163
OUT_OF_VERIFICATION_SCOPE = 'OUT_OF_VERIFICATION_SCOPE',
164164
/** "En cours de d'envoi auto". */
165165
PENDING_AUTO_SEND = 'PENDING_AUTO_SEND',
@@ -172,10 +172,10 @@ export namespace PriorNotification {
172172
}
173173
export const STATE_LABEL: Record<State, string> = {
174174
AUTO_SEND_DONE: 'Envoi auto. fait',
175-
AUTO_SEND_IN_PROGRESS: "En cours d'envoi auto",
175+
AUTO_SEND_IN_PROGRESS: "En cours d'envoi auto.",
176176
AUTO_SEND_REQUESTED: 'Envoi auto. demandé',
177177
FAILED_SEND: 'Échec de diffusion',
178-
OUT_OF_VERIFICATION_SCOPE: 'Hors diffusion',
178+
OUT_OF_VERIFICATION_SCOPE: 'Hors vérification',
179179
PENDING_AUTO_SEND: "En cours de d'envoi auto",
180180
PENDING_SEND: 'En cours de diffusion',
181181
PENDING_VERIFICATION: 'À vérifier (CNSP)',

0 commit comments

Comments
 (0)