Merge pull request #440 from MTES-MCT/feature/436-front-apply-mission-action-v2-to-front-ulam--pam

Feature/436 front apply mission action v2 to front ulam  pam

Author: lwih

backend/src/main/kotlin/fr/gouv/dgampa/rapportnav/infrastructure/api/bff/model/v2/BaseMissionEnvActionDataOutput.kt

@@ -3,6 +3,7 @@ package fr.gouv.dgampa.rapportnav.infrastructure.api.bff.model.v2
 import fr.gouv.dgampa.rapportnav.domain.entities.mission.env.envActions.ActionTargetTypeEnum
 import fr.gouv.dgampa.rapportnav.domain.entities.mission.env.envActions.VehicleTypeEnum
 import fr.gouv.dgampa.rapportnav.domain.entities.mission.nav.control.ControlType
+import fr.gouv.dgampa.rapportnav.infrastructure.api.bff.model.infraction.InfractionsByVessel
 import org.locationtech.jts.geom.Geometry
 
 interface BaseMissionEnvActionDataOutput {
@@ -20,7 +21,7 @@ interface BaseMissionEnvActionDataOutput {
     val actionNumberOfControls: Int?
     val actionTargetType: ActionTargetTypeEnum?
     val vehicleType: VehicleTypeEnum?
-    val infractions: List<InfractionEnvDataByOutput>?
+    val infractions: List<InfractionsByVessel>?
     val coverMissionZone: Boolean?
     val formattedControlPlans: Any?
     val availableControlTypesForInfraction: List<ControlType>?

backend/src/main/kotlin/fr/gouv/dgampa/rapportnav/infrastructure/api/bff/model/v2/InfractionEnvDataOutput.kt

@@ -2,11 +2,16 @@ package fr.gouv.dgampa.rapportnav.infrastructure.api.bff.model.v2
 
 import fr.gouv.dgampa.rapportnav.domain.entities.mission.env.envActions.*
 import fr.gouv.dgampa.rapportnav.domain.entities.mission.nav.control.ControlType
+import fr.gouv.dgampa.rapportnav.infrastructure.api.bff.model.infraction.Infraction
 import java.util.*
 
 class InfractionEnvDataByOutput(
-    key: String,
-    data: List<InfractionEnvDataOutput>
+    val vesselIdentifier: String? = null,
+    val vesselType: VesselTypeEnum? = null,
+    val controlTypesWithInfraction: List<ControlType>? = null,
+    val targetAddedByUnit: Boolean? = null,
+    val identityControlledPerson: String? = null,
+    val infractions: List<Infraction>
 )
 
 class InfractionEnvTargetOutput(

backend/src/main/kotlin/fr/gouv/dgampa/rapportnav/infrastructure/api/bff/model/v2/MissionEnvActionDataOutput.kt

@@ -3,6 +3,7 @@ package fr.gouv.dgampa.rapportnav.infrastructure.api.bff.model.v2
 import fr.gouv.dgampa.rapportnav.domain.entities.mission.env.envActions.ActionTargetTypeEnum
 import fr.gouv.dgampa.rapportnav.domain.entities.mission.env.envActions.VehicleTypeEnum
 import fr.gouv.dgampa.rapportnav.domain.entities.mission.nav.control.*
+import fr.gouv.dgampa.rapportnav.infrastructure.api.bff.model.infraction.InfractionsByVessel
 import org.locationtech.jts.geom.Geometry
 import java.time.Instant
 
@@ -25,7 +26,7 @@ class MissionEnvActionDataOutput(
     override val actionNumberOfControls: Int? = null,
     override val actionTargetType: ActionTargetTypeEnum? = null,
     override val vehicleType: VehicleTypeEnum? = null,
-    override val infractions: List<InfractionEnvDataByOutput>? = listOf(),
+    override val infractions: List<InfractionsByVessel>? = listOf(),
     override val coverMissionZone: Boolean? = null,
     override val controlSecurity: ControlSecurityEntity? = null,
     override val controlGensDeMer: ControlGensDeMerEntity? = null,

backend/src/main/kotlin/fr/gouv/dgampa/rapportnav/infrastructure/api/bff/model/v2/MissionEnvActionOutput.kt

@@ -7,6 +7,8 @@ import fr.gouv.dgampa.rapportnav.domain.entities.mission.nav.control.ControlType
 import fr.gouv.dgampa.rapportnav.domain.entities.mission.nav.status.ActionStatusType
 import fr.gouv.dgampa.rapportnav.domain.entities.mission.v2.MissionActionEntity
 import fr.gouv.dgampa.rapportnav.domain.entities.mission.v2.MissionEnvActionEntity
+import fr.gouv.dgampa.rapportnav.infrastructure.api.bff.model.infraction.Infraction
+import fr.gouv.dgampa.rapportnav.infrastructure.api.bff.model.infraction.InfractionsByVessel
 
 class MissionEnvActionOutput(
     override val id: String,
@@ -72,13 +74,21 @@ class MissionEnvActionOutput(
             )
         }
 
-        private fun getInfractionGroupBy(action: MissionEnvActionEntity): List<InfractionEnvDataByOutput> {
-            val infractions = action.envInfractions?.map { InfractionEnvDataOutput.fromInfractionEnvEntity(it) }?: listOf()
-            val infractions1 = action.navInfractions?.map{ InfractionEnvDataOutput.fromInfractionNavEntity(it)}?: listOf()
+        private fun getInfractionGroupBy(action: MissionEnvActionEntity): List<InfractionsByVessel> {
+            val envInfractions = action.envInfractions?.map { Infraction.fromEnvInfractionEntity(it) }?: listOf()
+            val navInfractions = action.navInfractions?.map{ Infraction.fromInfractionEntity(it)}?: listOf()
 
-            return (infractions+ infractions1)
+            return (envInfractions+ navInfractions)
+                .filter { it.target?.vesselIdentifier == null  &&  it.target?.identityControlledPerson == null}
                 .groupBy { it.target?.vesselIdentifier ?: it.target?.identityControlledPerson }
-                .map { (key, values) ->  InfractionEnvDataByOutput(key = key?:"", data = values)}
+                .map { (vesselIdentifier, infractions) ->
+                    InfractionsByVessel(
+                        vesselIdentifier = vesselIdentifier,
+                        vesselType = infractions.firstOrNull()?.target?.vesselType,
+                        infractions = infractions,
+                        identityControlledPerson = infractions.firstOrNull()?.target?.identityControlledPerson
+                    )
+                }
         }
     }
 }

backend/src/main/resources/graphql/controls.graphqls

@@ -36,6 +36,7 @@ type ControlNavigation {
   unitHasConfirmed: Boolean
   observations: String
   infractions: [Infraction]
+  hasBeenDone: Boolean
 }
 
 type ControlSecurity {
@@ -45,6 +46,7 @@ type ControlSecurity {
   unitHasConfirmed: Boolean
   observations: String
   infractions: [Infraction]
+  hasBeenDone: Boolean
 }
 
 type ControlAdministrative {
@@ -57,6 +59,7 @@ type ControlAdministrative {
   compliantSecurityDocuments: ControlResult
   observations: String
   infractions: [Infraction]
+  hasBeenDone: Boolean
 }
 
 type ControlGensDeMer {
@@ -69,6 +72,7 @@ type ControlGensDeMer {
   knowledgeOfFrenchLawAndLanguage: ControlResult
   observations: String
   infractions: [Infraction]
+  hasBeenDone: Boolean
 }
 
 input ControlNavigationInput {

backend/src/main/resources/graphql/mission-action.graphqls

@@ -50,7 +50,7 @@ type MissionEnvActionDataOutput {
   vehicleType: VehicleTypeEnum
   coverMissionZone: Boolean
   controlsToComplete: [ControlType]
-  infractions:[InfractionEnvDataByOutput]
+  infractions:[InfractionByTarget]
   availableControlTypesForInfraction: [ControlType]
 }
 

frontend/src/features/common/components/elements/dates/date-picker.tsx

@@ -34,13 +34,14 @@ const DatePicker: FC<DatePickerProps> = ({ allowedRange, ...props }: DatePickerP
   const handleChange = (date?: Date) => {
     const correctedDate = date ? postprocessDateFromPicker(date) : undefined
     const validation = validate(allowedRange, date)
-
-    if (validation?.ok && props.onChange) {
-      props.onChange(correctedDate)
+    if (validation?.ok) {
       setError(undefined)
     } else {
       setError(validation?.message)
     }
+    if (props.onChange) {
+      props.onChange(correctedDate)
+    }
   }
 
   return <MonitorUIDatePicker {...props} defaultValue={value} onChange={handleChange} error={error || props.error} />

frontend/src/features/common/components/elements/dates/daterange-picker.tsx

@@ -51,15 +51,10 @@ const DateRangePicker: FC<DateRangePickerProps> = ({
   }, [selectedRange, allowedRange])
 
   const handleChange = (date?: Date, field: 'startDate' | 'endDate') => {
-    if (date) {
-      field === 'startDate' ? setStartDate(date) : setEndDate(date)
-      const correctedRange = [
-        field === 'startDate' ? date : startDate,
-        field === 'endDate' ? date : endDate
-      ] as DateRange
+    field === 'startDate' ? setStartDate(date) : setEndDate(date)
+    const correctedRange = [field === 'startDate' ? date : startDate, field === 'endDate' ? date : endDate] as DateRange
 
-      onChange(correctedRange)
-    }
+    onChange(correctedRange)
   }
 
   return (

frontend/src/features/common/types/control-types.ts

@@ -22,9 +22,10 @@ export enum ControlType {
 
 type ControlModel = {
   id: string
-  amountOfControls: number
-  unitShouldConfirm?: boolean
   unitHasConfirmed?: boolean
+  unitShouldConfirm?: boolean
+  hasBeenDone?: boolean
+  amountOfControls: number
   observations?: string
   infractions?: Infraction[]
 }

frontend/src/v2/features/common/components/ui/yes-no-toogle.tsx

@@ -0,0 +1,60 @@
+import { Accent, Button, Icon, Size, THEME } from '@mtes-mct/monitor-ui'
+import { isNil } from 'lodash'
+import { useEffect, useState } from 'react'
+import { Stack } from 'rsuite'
+
+const activeStyle = {
+  color: 'white',
+  borderColor: THEME.color.blueGray,
+  backgroundColor: THEME.color.blueGray
+}
+
+const inactiveStyle = {
+  color: THEME.color.charcoal,
+  borderColor: THEME.color.blueGray,
+  backgroundColor: THEME.color.blueGray25
+}
+
+type YesNoToogleProps = {
+  initValue?: boolean
+  onSubmit?: (response: boolean) => void
+}
+
+const YesNoToogle: React.FC<YesNoToogleProps> = ({ initValue, onSubmit }) => {
+  const [value, setValue] = useState<boolean>()
+
+  const handleResponse = (response: boolean) => {
+    setValue(response)
+    if (onSubmit) onSubmit(response)
+  }
+
+  useEffect(() => {
+    if (isNil(value)) return
+    setValue(initValue)
+  }, [initValue])
+
+  return (
+    <Stack direction={'row'}>
+      <Button
+        Icon={Icon.Confirm}
+        size={Size.NORMAL}
+        accent={Accent.PRIMARY}
+        onClick={() => handleResponse(true)}
+        style={value === true ? activeStyle : inactiveStyle}
+      >
+        Oui
+      </Button>
+      <Button
+        Icon={Icon.Reject}
+        size={Size.NORMAL}
+        accent={Accent.PRIMARY}
+        onClick={() => handleResponse(false)}
+        style={{ borderLeft: 'none', ...(value === false ? activeStyle : inactiveStyle) }}
+      >
+        Non
+      </Button>
+    </Stack>
+  )
+}
+
+export default YesNoToogle

frontend/src/v2/features/common/hooks/use-abstract-formik-form.tsx

@@ -45,7 +45,7 @@ export function useAbstractFormik<T, M>(
   ) => {
     const valueToSubmit = beforeSubmit(value, errors)
     setInitValue(value)
-    if (onSubmit) await onSubmit(valueToSubmit)
+    if (onSubmit && valueToSubmit) await onSubmit(valueToSubmit)
   }
 
   return {