suppress fields

src/components/CreationCohort/DiagramView/components/LogicalOperator/components/CriteriaRightPanel/AdvancedInputs/index.tsx

@@ -15,7 +15,7 @@ import { DurationRangeType } from 'types/searchCriterias'
 import { CriteriaLabel } from 'components/ui/CriteriaLabel'
 import { getOccurenceDateLabel } from 'utils/requestCriterias'
 import ExecutiveUnitsInput from 'components/ui/Inputs/ExecutiveUnits'
-import { InputWrapper } from 'components/ui/Inputs'
+import { InputWrapper } from 'components/ui/Inputs/styles'
 
 type AdvancedInputsProps = {
   sourceType: SourceType

src/components/Dashboard/FormsList/index.tsx

@@ -8,15 +8,14 @@ import DisplayDigits from 'components/ui/Display/DisplayDigits'
 import ExecutiveUnitsFilter from 'components/Filters/ExecutiveUnitsFilter'
 import Modal from 'components/ui/Modal'
 import { DTTB_ResultsType as ResultsType, LoadingStatus } from 'types'
-import { FilterKeys, LabelObject } from 'types/searchCriterias'
+import { FilterKeys, FormNames, LabelObject } from 'types/searchCriterias'
 import { CanceledError } from 'axios'
 import services from 'services/aphp'
 import useSearchCriterias, { initFormsCriterias } from 'reducers/searchCriteriasReducer'
 import { cancelPendingRequest } from 'utils/abortController'
 import { selectFiltersAsArray } from 'utils/filters'
 import { SourceType } from 'types/scope'
 import { Questionnaire } from 'fhir/r4'
-import MaternityFormFilter from 'components/Filters/MaternityFormFilter'
 import DataTableForms from 'components/DataTable/DataTableForms'
 import { useSearchParams } from 'react-router-dom'
 import { checkIfPageAvailable, cleanSearchParams, handlePageError } from 'utils/paginationUtils'
@@ -25,6 +24,19 @@ import { getCodeList } from 'services/aphp/serviceValueSets'
 import { getConfig } from 'config'
 import TextInput from 'components/Filters/TextInput'
 import MultiSelectInput from 'components/Filters/MultiSelectInput'
+import labels from 'labels.json'
+import CheckboxsFilter from 'components/Filters/CheckboxsFilter'
+
+const formOptions = [
+  {
+    id: FormNames.PREGNANCY,
+    label: labels.formNames.pregnancy
+  },
+  {
+    id: FormNames.HOSPIT,
+    label: labels.formNames.hospit
+  }
+]
 
 const FormsList = () => {
   const theme = useTheme()
@@ -212,7 +224,8 @@ const FormsList = () => {
           label="IPP :"
           placeholder="'Exemple: 8000000000001,8000000000002'"
         />
-        <MaternityFormFilter name={FilterKeys.FORM_NAME} value={formName} />
+        <CheckboxsFilter name={FilterKeys.FORM_NAME} value={formName} label="Formulaire :" options={formOptions} />
+        {/*<MaternityFormFilter name={FilterKeys.FORM_NAME} value={formName} />*/}
         <ExecutiveUnitsFilter
           sourceType={SourceType.FORM_RESPONSE}
           value={executiveUnits}

src/components/Filters/BirthdatesRangesFilters/index.tsx

@@ -1,4 +1,4 @@
-import { InputWrapper } from 'components/ui/Inputs'
+import { InputWrapper } from 'components/ui/Inputs/styles'
 import DurationRange from 'components/ui/Inputs/DurationRange'
 import { FormContext } from 'components/ui/Modal'
 import React, { useContext, useEffect, useState } from 'react'

src/components/Filters/CheckboxsFilter/index.tsx

@@ -1,5 +1,5 @@
 import { Checkbox, FormControlLabel, FormGroup, Typography } from '@mui/material'
-import { InputWrapper } from 'components/ui/Inputs'
+import { InputWrapper } from 'components/ui/Inputs/styles'
 import { FormContext } from 'components/ui/Modal'
 import React, { useContext, useEffect, useState } from 'react'
 import { LabelObject } from 'types/searchCriterias'

src/components/Filters/CodeFilter/index.tsx

@@ -1,6 +1,6 @@
 import { Typography } from '@mui/material'
 import ValueSetField from 'components/SearchValueSet/ValueSetField'
-import { InputWrapper } from 'components/ui/Inputs'
+import { InputWrapper } from 'components/ui/Inputs/styles'
 import { FormContext } from 'components/ui/Modal'
 import React, { useContext, useEffect, useState } from 'react'
 import { Hierarchy } from 'types/hierarchy'

src/components/Filters/DocTypesFilter/index.tsx

@@ -1,5 +1,5 @@
 import { Autocomplete, AutocompleteRenderGroupParams, Checkbox, Grid, TextField, Typography } from '@mui/material'
-import { InputWrapper } from 'components/ui/Inputs'
+import { InputWrapper } from 'components/ui/Inputs/styles'
 import { FormContext } from 'components/ui/Modal'
 import React, { useContext, useEffect, useState } from 'react'
 import { SimpleCodeType } from 'types'

src/components/Filters/MultiSelectInput/index.tsx

@@ -1,5 +1,5 @@
 import { Autocomplete, TextField, Typography } from '@mui/material'
-import { InputWrapper } from 'components/ui/Inputs'
+import { InputWrapper } from 'components/ui/Inputs/styles'
 import { FormContext } from 'components/ui/Modal'
 import React, { useContext, useEffect, useState } from 'react'
 import { LabelObject } from 'types/searchCriterias'
@@ -13,7 +13,7 @@ type PrescriptionTypesFilterProps = {
   disabled?: boolean
 }
 
-const SelectInput = ({ name, value, label, options, disabled = false }: PrescriptionTypesFilterProps) => {
+const MultiSelectInput = ({ name, value, label, options, disabled = false }: PrescriptionTypesFilterProps) => {
   const context = useContext(FormContext)
   const [input, setInput] = useState(value)
 
@@ -41,4 +41,4 @@ const SelectInput = ({ name, value, label, options, disabled = false }: Prescrip
   )
 }
 
-export default SelectInput
+export default MultiSelectInput

src/components/Filters/PatientsNbFilter/index.tsx

@@ -1,5 +1,5 @@
 import { FormLabel, Grid, TextField, Typography } from '@mui/material'
-import { InputWrapper } from 'components/ui/Inputs'
+import { InputWrapper } from 'components/ui/Inputs/styles'
 import { ErrorMessage } from 'components/ui/Inputs/Errors'
 import { BlockWrapper } from 'components/ui/Layout'
 import { FormContext } from 'components/ui/Modal'

src/components/Filters/RadioGroupFilter/index.tsx

@@ -1,5 +1,5 @@
 import { Typography } from '@mui/material'
-import { InputWrapper } from 'components/ui/Inputs'
+import { InputWrapper } from 'components/ui/Inputs/styles'
 import { FormContext } from 'components/ui/Modal'
 import RadioGroup from 'components/ui/RadioGroup'
 import React, { useContext, useEffect, useState } from 'react'

src/components/Filters/TextInput/index.tsx

@@ -1,5 +1,5 @@
 import { Grid, TextField, Typography } from '@mui/material'
-import { InputWrapper } from 'components/ui/Inputs'
+import { InputWrapper } from 'components/ui/Inputs/styles'
 import { ErrorMessage } from 'components/ui/Inputs/Errors'
 import { FormContext } from 'components/ui/Modal'
 import React, { useContext, useEffect, useState } from 'react'

src/components/Patient/PatientForms/MaternityForms/index.tsx

@@ -4,7 +4,6 @@ import { Grid } from '@mui/material'
 import { FilterList } from '@mui/icons-material'
 import DatesRangeFilter from 'components/Filters/DatesRangeFilter'
 import ExecutiveUnitsFilter from 'components/Filters/ExecutiveUnitsFilter'
-import MaternityFormFilter from 'components/Filters/MaternityFormFilter'
 import Button from 'components/ui/Button'
 import Chip from 'components/ui/Chip'
 import { BlockWrapper } from 'components/ui/Layout'
@@ -17,7 +16,7 @@ import { cancelPendingRequest } from 'utils/abortController'
 import { selectFiltersAsArray } from 'utils/filters'
 import { Questionnaire } from 'fhir/r4'
 import { LoadingStatus } from 'types'
-import { FilterKeys, LabelObject } from 'types/searchCriterias'
+import { FilterKeys, FormNames, LabelObject } from 'types/searchCriterias'
 import Timeline from './Timeline'
 import services from 'services/aphp'
 import { SourceType } from 'types/scope'
@@ -26,6 +25,20 @@ import { getCleanGroupId } from 'utils/paginationUtils'
 import { getCodeList } from 'services/aphp/serviceValueSets'
 import { getConfig } from 'config'
 import MultiSelectInput from 'components/Filters/MultiSelectInput'
+import CheckboxsFilter from 'components/Filters/CheckboxsFilter'
+import labels from 'labels.json'
+
+const formOptions = [
+  {
+    id: FormNames.PREGNANCY,
+    label: labels.formNames.pregnancy
+  },
+  {
+    id: FormNames.HOSPIT,
+    label: labels.formNames.hospit
+  }
+]
+
 
 const MaternityForm = () => {
   const [toggleModal, setToggleModal] = useState(false)
@@ -126,7 +139,12 @@ const MaternityForm = () => {
                 onClose={() => setToggleModal(false)}
                 onSubmit={(newFilters) => addFilters({ ...filters, ...newFilters })}
               >
-                <MaternityFormFilter name={FilterKeys.FORM_NAME} value={formName} />
+                <CheckboxsFilter
+                  name={FilterKeys.FORM_NAME}
+                  value={formName}
+                  label="Formulaire :"
+                  options={formOptions}
+                />
                 <DatesRangeFilter values={[startDate, endDate]} names={[FilterKeys.START_DATE, FilterKeys.END_DATE]} />
                 <ExecutiveUnitsFilter
                   sourceType={SourceType.FORM_RESPONSE}

src/components/ui/Inputs/ExecutiveUnits/index.tsx

@@ -2,7 +2,7 @@ import { CircularProgress, FormLabel, Grid, IconButton, Tooltip } from '@mui/mat
 import React, { ReactNode, useEffect, useState } from 'react'
 import { LoadingStatus, ScopeElement } from 'types'
 import InfoIcon from '@mui/icons-material/Info'
-import { InputWrapper } from 'components/ui/Inputs'
+import { InputWrapper } from 'components/ui/Inputs/styles'
 import { SourceType } from 'types/scope'
 import { Hierarchy } from 'types/hierarchy'
 import servicesPerimeters from 'services/aphp/servicePerimeters'