WIP

aphp · Dec 9, 2024 · 4e2c82f · 4e2c82f
1 parent 8f21820
commit 4e2c82f
Show file tree

Hide file tree

Showing 17 changed files with 1,183 additions and 23 deletions.
diff --git a/src/components/Dashboard/ExportModal/ExportModal.tsx b/src/components/Dashboard/ExportModal/ExportModal.tsx
@@ -695,12 +695,14 @@ const ExportTable: React.FC<ExportTableProps> = ({
               renderOption={(props, option) => <li {...props}>{option.name}</li>}
               renderInput={(params) => <TextField {...params} label="Sélectionnez un filtre" />}
               value={exportTable.fhir_filter}
-              onChange={(_, value) => _onChangeValue(value)}
+              onChange={(_, value) => {
+                _onChangeValue(value)
+              }}
             />
           </Grid>
         </Grid>
       )}
-      <Grid item container alignItems="center" justifyContent="space-between" display="none">
+      {/* <Grid item container alignItems="center" justifyContent="space-between" display="none">
         <Grid item xs={5}>
           <Typography className={classes.textBody2}>
             Filtrer cette table en respectant les contraintes relationnelles avec les autres tables sélectionnées:
@@ -722,7 +724,7 @@ const ExportTable: React.FC<ExportTableProps> = ({
             </Grid>
           </RadioGroup>
         </Grid>
-      </Grid>
+      </Grid> */}
       {exportTable.checked &&
         exportTable.count > (exportTable.resourceType === ResourceType.DOCUMENTS ? 5000 : exportLinesLimit) && (
           <Typography color={'red'} fontWeight={'bold'} fontSize={12}>

diff --git a/src/components/Dashboard/ExportModal/exportUtils.ts b/src/components/Dashboard/ExportModal/exportUtils.ts
@@ -378,8 +378,8 @@ export const fetchAllResourcesCount = async (cohortId: string) => {
       observationCount,
       imagingCount,
       encounterVisitCount,
-      encounterDetailsCounts,
-      questionnaireResponseCount
+      encounterDetailsCounts
+      // questionnaireResponseCount
     ] = await Promise.all([
       fetchPatientCount(cohortId),
       fetchConditionCount(cohortId),
@@ -391,8 +391,8 @@ export const fetchAllResourcesCount = async (cohortId: string) => {
       fetchObservationCount(cohortId),
       fetchImagingCount(cohortId),
       fetchEncounterCount(cohortId, true),
-      fetchEncounterCount(cohortId),
-      fetchQuestionnaireCount(cohortId)
+      fetchEncounterCount(cohortId)
+      // fetchQuestionnaireCount(cohortId)
     ])
 
     return {
@@ -406,8 +406,8 @@ export const fetchAllResourcesCount = async (cohortId: string) => {
       observationCount,
       imagingCount,
       encounterVisitCount,
-      encounterDetailsCounts,
-      questionnaireResponseCount
+      encounterDetailsCounts
+      // questionnaireResponseCount
     }
   } catch (error) {
     console.error('Erreur lors de fetchQuestionnaireCount', error)
@@ -435,19 +435,7 @@ export const fetchResourceCount = async (cohortId: string, table: ExportCSVTable
       [ResourceType.IMAGING]: fetchImagingCount
     }
 
-    const fetcher =
-      fetchers[
-        resourceType as
-          | ResourceType.PATIENT
-          | ResourceType.CONDITION
-          | ResourceType.PROCEDURE
-          | ResourceType.CLAIM
-          | ResourceType.DOCUMENTS
-          | ResourceType.MEDICATION_REQUEST
-          | ResourceType.MEDICATION_ADMINISTRATION
-          | ResourceType.OBSERVATION
-          | ResourceType.IMAGING
-      ]
+    const fetcher = fetchers[resourceType as keyof typeof fetchers]
 
     return (await fetcher(cohortId, filters)) ?? 0
   } catch (error) {
@@ -471,3 +459,76 @@ export const getRightCount = (counts: Counts, tableResourceType: ResourcesWithEx
 
   return countMapping[tableResourceType] ?? 0
 }
+
+export const fetchResourceCount2 = async (cohortId: string, resourceType: ResourceType, fhirFilter?: any) => {
+  try {
+    const filters = await mapRequestParamsToSearchCriteria(fhirFilter?.filter ?? '', resourceType)
+    const fetchers = {
+      [ResourceType.PATIENT]: fetchPatientCount,
+      [ResourceType.CONDITION]: fetchConditionCount,
+      [ResourceType.PROCEDURE]: fetchProcedureCount,
+      [ResourceType.CLAIM]: fetchClaimCount,
+      [ResourceType.DOCUMENTS]: fetchDocumentsCount,
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
+      [ResourceType.MEDICATION_REQUEST]: (cohortId: string, filters: any) =>
+        fetchMedicationCount(cohortId, ResourceType.MEDICATION_REQUEST, filters),
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
+      [ResourceType.MEDICATION_ADMINISTRATION]: (cohortId: string, filters: any) =>
+        fetchMedicationCount(cohortId, ResourceType.MEDICATION_ADMINISTRATION, filters),
+      [ResourceType.OBSERVATION]: fetchObservationCount,
+      [ResourceType.IMAGING]: fetchImagingCount
+    }
+
+    const fetcher = fetchers[resourceType as keyof typeof fetchers]
+
+    return (await fetcher(cohortId, filters)) ?? 0
+  } catch (error) {
+    console.error('Erreur lors du fetch du count de la ressource', error)
+    throw error
+  }
+}
+
+export const getResourceType = (tableName: string): ResourceType => {
+  const resourceType = {
+    imaging_study: ResourceType.IMAGING,
+    drug_exposure_administration: ResourceType.MEDICATION_ADMINISTRATION,
+    measurement: ResourceType.OBSERVATION,
+    imaging_series: ResourceType.UNKNOWN,
+    condition_occurrence: ResourceType.CONDITION,
+    iris: ResourceType.UNKNOWN,
+    visit_detail: ResourceType.UNKNOWN,
+    person: ResourceType.PATIENT,
+    note: ResourceType.DOCUMENTS,
+    fact_relationship: ResourceType.UNKNOWN,
+    care_site: ResourceType.UNKNOWN,
+    visit_occurrence: ResourceType.UNKNOWN,
+    cost: ResourceType.CLAIM,
+    procedure_occurrence: ResourceType.PROCEDURE,
+    drug_exposure_prescription: ResourceType.MEDICATION_REQUEST,
+    questionnaireresponse: ResourceType.UNKNOWN
+  }[tableName]
+
+  return resourceType ?? ResourceType.UNKNOWN
+}
+
+export const getExportTableLabel = (tableName: string) => {
+  const tableLabel = {
+    imaging_study: 'Fait - Imagerie - Étude',
+    drug_exposure_administration: 'Fait - Médicaments - Administration',
+    measurement: 'Fait - Biologie',
+    imaging_series: 'Fait - Imagerie - Séries',
+    condition_occurrence: 'Fait - PMSI - Diagnostics',
+    care_site: 'Structure hospitalière',
+    iris: 'Zone géographique',
+    visit_detail: 'Détail de prise en charge',
+    person: 'Patient',
+    note: 'Fait - Documents cliniques',
+    fact_relationship: 'Référentiel',
+    visit_occurrence: 'Prise en charge',
+    cost: 'Fait - PMSI - GHM',
+    procedure_occurrence: 'Fait - PMSI - Actes',
+    drug_exposure_prescription: 'Fait - Médicaments - Prescription',
+    QuestionnaireResponse: 'Formulaires'
+  }[tableName]
+  return tableLabel ?? '-'
+}
diff --git a/src/components/Routes/AppNavigation/config.tsx b/src/components/Routes/AppNavigation/config.tsx
@@ -13,6 +13,9 @@ import CareSiteView from 'views/Scope/CareSiteView'
 import MyCohorts from 'views/MyCohorts'
 import MyRequests from 'views/MyRequests'
 import DownloadPopup from 'views/DownloadPopup/DownloadPopup'
+import Export from 'pages/Export'
+import ExportRequest from 'pages/ExportRequest'
+import FeasibilityReports from 'pages/FeasibilityReports'
 
 // import { ODD_CONTACT } from '../../../constants'
 
@@ -217,6 +220,42 @@ const configRoutes: configRoute[] = [
     element: <Patient />,
     exact: false
   },
+
+  /**
+   * Cohort360: Export Page
+   */
+  {
+    path: '/exports',
+    name: '/exports',
+    isPrivate: true,
+    element: <Export />,
+    exact: true,
+    displaySideBar: true
+  },
+  {
+    path: '/exports/new',
+    name: '/exports/new',
+    isPrivate: true,
+    element: <ExportRequest />,
+    exact: true,
+    displaySideBar: true
+  },
+
+  /**
+   * Cohort360: Feasibility Reports Page
+   */
+  {
+    path: '/feasibility-reports',
+    name: '/feasibility-reports',
+    isPrivate: true,
+    element: <FeasibilityReports />,
+    exact: true,
+    displaySideBar: true
+  },
+
+  /**
+   * Cohort360: Export download Page
+   */
   {
     path: '/download/:resource/:itemId',
     name: '/download/:resource/:itemId',

diff --git a/src/components/Routes/LeftSideBar/LeftSideBar.tsx b/src/components/Routes/LeftSideBar/LeftSideBar.tsx
@@ -370,6 +370,26 @@ const LeftSideBar: React.FC<{ open?: boolean }> = (props) => {
                     Mes requêtes
                   </Link>
                 </ListItem>
+                <ListItem>
+                  <Link
+                    id="exports-link"
+                    onClick={() => navigate('/exports')}
+                    underline="hover"
+                    className={classes.nestedTitle}
+                  >
+                    Mes exports
+                  </Link>
+                </ListItem>
+                <ListItem>
+                  <Link
+                    id="feasibility-reports-link"
+                    onClick={() => navigate('/feasibility-reports')}
+                    underline="hover"
+                    className={classes.nestedTitle}
+                  >
+                    Mes rapports de faisabilite
+                  </Link>
+                </ListItem>
               </List>
             </Collapse>
           </List>

diff --git a/src/components/Tables/index.tsx b/src/components/Tables/index.tsx
@@ -0,0 +1,11 @@
+import React from 'react'
+
+const TableLines: React.FC = () => {
+  return (
+    <div>
+      <h1>Tables lines</h1>
+    </div>
+  )
+}
+
+export default TableLines
diff --git a/src/components/ui/HeaderPage/index.tsx b/src/components/ui/HeaderPage/index.tsx
@@ -0,0 +1,21 @@
+import React from 'react'
+
+import { Grid, Typography } from '@mui/material'
+
+type HeaderPageProps = {
+  id: string
+  title: string
+}
+
+const HeaderPage: React.FC<HeaderPageProps> = (props) => {
+  const { id, title } = props
+  return (
+    <Grid item xs={12} margin="60px 0">
+      <Typography id={id} variant="h1" color="primary" padding="20px 0" borderBottom="1px solid #D0D7D8">
+        {title}
+      </Typography>
+    </Grid>
+  )
+}
+
+export default HeaderPage
diff --git a/src/config.tsx b/src/config.tsx
@@ -19,6 +19,7 @@ type AppConfig = {
     export: {
       enabled: boolean
       exportLinesLimit: number
+      exportTables: string
     }
     observation: {
       enabled: boolean
@@ -144,6 +145,7 @@ type AppConfig = {
     wsProtocol: string
     fhirUrl: string
     backendUrl: string
+    datamodelUrl: string
     oidc?: {
       issuer: string
       redirectUri: string
@@ -196,7 +198,8 @@ let config: AppConfig = {
     },
     export: {
       enabled: true,
-      exportLinesLimit: 300000
+      exportLinesLimit: 300000,
+      exportTables: ''
     },
     observation: {
       enabled: true,
@@ -291,6 +294,7 @@ let config: AppConfig = {
     wsProtocol: 'ws://',
     backendUrl: '/api/back',
     fhirUrl: '/api/fhir',
+    datamodelUrl: '/api/datamodel2',
     sessionTimeout: 780000,
     refreshTokenInterval: 180000,
     codeDisplayJWT: 'ArrowUp,ArrowUp,ArrowDown,ArrowDown,ArrowLeft,ArrowRight,ArrowLeft,ArrowRight,b,a,Enter',

diff --git a/src/pages/Export/index.tsx b/src/pages/Export/index.tsx
@@ -0,0 +1,48 @@
+import React from 'react'
+
+import { Grid, CssBaseline } from '@mui/material'
+
+import HeaderPage from 'components/ui/HeaderPage'
+import DataTable from 'components/DataTable/DataTable'
+import Tables from 'components/Tables'
+
+import { useAppSelector } from 'state'
+
+import sideBarTransition from 'styles/sideBarTransition'
+
+const exportColumnsTable = [
+  { label: 'N° de cohorte' },
+  { label: 'Nom de la cohorte' },
+  { label: 'Nombre de patient' },
+  { label: "Nom de l'export" },
+  { label: 'Date de l’export' },
+  { label: 'Statut' },
+  { label: 'Actions' }
+]
+
+const Export: React.FC = () => {
+  const { classes, cx } = sideBarTransition()
+  const openDrawer = useAppSelector((state) => state.drawer)
+
+  return (
+    <Grid
+      container
+      direction="column"
+      className={cx(classes.appBar, {
+        [classes.appBarShift]: openDrawer
+      })}
+    >
+      <Grid container justifyContent="center" alignItems="center">
+        <CssBaseline />
+        <Grid container item xs={11}>
+          <HeaderPage id="export-page-title" title="Mes exports" />
+          <DataTable columns={exportColumnsTable}>
+            <p>salut</p>
+          </DataTable>
+        </Grid>
+      </Grid>
+    </Grid>
+  )
+}
+
+export default Export