Merge pull request #352 from MTES-MCT/fix-clemence

fix: fixes while clemence was testing
MTES-MCT · Sep 23, 2024 · f44de4a · f44de4a
2 parents d66d012 + 79eb4bc
commit f44de4a
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 2 deletions.
diff --git a/...ouv/dgampa/rapportnav/domain/entities/mission/nav/generalInfo/MissionGeneralInfoEntity.kt b/...ouv/dgampa/rapportnav/domain/entities/mission/nav/generalInfo/MissionGeneralInfoEntity.kt
@@ -1,11 +1,14 @@
 package fr.gouv.dgampa.rapportnav.domain.entities.mission.nav.generalInfo
 
+import fr.gouv.dgampa.rapportnav.config.MandatoryForStats
+
 data class MissionGeneralInfoEntity(
     var id: Int,
     var missionId: Int,
     var distanceInNauticalMiles: Float? = null,
     var consumedGOInLiters: Float? = null,
     var consumedFuelInLiters: Float? = null,
     var serviceId: Int? = null,
+    @MandatoryForStats
     var nbrOfRecognizedVessel: Int? = null,
 )
diff --git a/frontend/src/features/common/components/elements/date-picker.tsx b/frontend/src/features/common/components/elements/date-picker.tsx
@@ -18,7 +18,6 @@ export const preprocessDateForPicker = (date?: Date): Date | undefined => {
 
 // Postprocessing after receiving from datepicker
 export const postprocessDateFromPicker = (date?: Date): Date | undefined => {
-  debugger
   if (!date || !isValid(date)) {
     return
   }

diff --git a/frontend/src/features/pam/mission/components/elements/actions/action-control-env.tsx b/frontend/src/features/pam/mission/components/elements/actions/action-control-env.tsx
@@ -77,6 +77,7 @@ const ActionControlEnv: React.FC<ActionControlPropsEnv> = ({ action }) => {
         <Stack.Item>
           <Label>Lieu du contrôle</Label>
           <CoordinatesInput
+            readOnly={true}
             defaultValue={(extractLatLonFromMultiPoint(actionData?.geom) as Coordinates) || undefined}
             coordinatesFormat={CoordinatesFormat.DEGREES_MINUTES_DECIMALS}
             // label="Lieu du contrôle"

diff --git a/frontend/src/features/pam/mission/components/elements/actions/action-control-fish.tsx b/frontend/src/features/pam/mission/components/elements/actions/action-control-fish.tsx
@@ -105,6 +105,7 @@ const ActionControlFish: React.FC<ActionControlPropsFish> = ({ action }) => {
         <Stack.Item>
           <Label>Lieu du contrôle</Label>
           <CoordinatesInput
+            readOnly={true}
             defaultValue={[actionData?.latitude as any, actionData?.longitude as any]}
             coordinatesFormat={CoordinatesFormat.DEGREES_MINUTES_DECIMALS}
             // label="Lieu du contrôle"

diff --git a/frontend/src/features/pam/mission/components/elements/mission-observations-unit.tsx b/frontend/src/features/pam/mission/components/elements/mission-observations-unit.tsx
@@ -34,7 +34,7 @@ const MissionObservationsUnit: React.FC<MissionObservationsByUnitProps> = ({ mis
       variables: {
         mission: {
           missionId,
-          observationsByUnit: observations || ''
+          observationsByUnit: observations ?? ''
         }
       }
     })
@@ -47,6 +47,7 @@ const MissionObservationsUnit: React.FC<MissionObservationsByUnitProps> = ({ mis
           <>
             <FormikEffect onChange={handleSubmit} />
             <FormikTextarea
+              isRequired={true}
               isLight={false}
               name="observations"
               data-testid="mission-general-observation"

diff --git a/frontend/src/features/pam/mission/hooks/use-action-by-id.tsx b/frontend/src/features/pam/mission/hooks/use-action-by-id.tsx
@@ -20,6 +20,7 @@ export const GET_ACTION_BY_ID = gql`
           id
           actionType
           actionDatetimeUtc
+          actionEndDatetimeUtc
           vesselId
           vesselName
           latitude