wip: fixed typo in occurrences - Ref gestion-de-projet#2354

aphp · Nov 29, 2024 · 023544d · 023544d
1 parent 49704fb
commit 023544d
Show file tree

Hide file tree

Showing 14 changed files with 22 additions and 15 deletions.
diff --git a/...nents/LogicalOperator/components/CriteriaRightPanel/CriteriaForm/criteriaform.stories.tsx b/...nents/LogicalOperator/components/CriteriaRightPanel/CriteriaForm/criteriaform.stories.tsx
@@ -72,7 +72,7 @@ export const Default: Story = {
             label: "Nombre d'occurrences",
             withHierarchyInfo: true,
             buildInfo: {
-              chipDisplayMethodExtraArgs: [{ type: 'string', value: "Nombre d'occurences" }]
+              chipDisplayMethodExtraArgs: [{ type: 'string', value: "Nombre d'occurrences" }]
             }
           },
           {

diff --git a/...agramView/components/LogicalOperator/components/CriteriaRightPanel/CriteriaForm/index.tsx b/...agramView/components/LogicalOperator/components/CriteriaRightPanel/CriteriaForm/index.tsx
@@ -41,7 +41,7 @@ export default function CriteriaForm<T extends CommonCriteriaData>(props: Criter
   }, [criteriaData, onDataChange])
 
   console.log('rendering form')
-
+  console.log('test itemSections', itemSections)
   return (
     <CriteriaLayout
       criteriaLabel={`${label}`}

diff --git a/...DiagramView/components/LogicalOperator/components/CriteriaRightPanel/forms/BiologyForm.ts b/...DiagramView/components/LogicalOperator/components/CriteriaRightPanel/forms/BiologyForm.ts
@@ -62,7 +62,7 @@ export const form: () => CriteriaForm<ObservationDataType> = () => ({
           type: 'numberAndComparator',
           label: "Nombre d'occurrences",
           buildInfo: {
-            chipDisplayMethodExtraArgs: [{ type: 'string', value: "Nombre d'occurences" }]
+            chipDisplayMethodExtraArgs: [{ type: 'string', value: "Nombre d'occurrences" }]
           }
         },
         {

diff --git a/...rt/DiagramView/components/LogicalOperator/components/CriteriaRightPanel/forms/CCAMForm.ts b/...rt/DiagramView/components/LogicalOperator/components/CriteriaRightPanel/forms/CCAMForm.ts
@@ -55,7 +55,7 @@ export const form: () => CriteriaForm<CcamDataType> = () => ({
           type: 'numberAndComparator',
           label: "Nombre d'occurrences",
           buildInfo: {
-            chipDisplayMethodExtraArgs: [{ type: 'string', value: "Nombre d'occurences" }]
+            chipDisplayMethodExtraArgs: [{ type: 'string', value: "Nombre d'occurrences" }]
           }
         },
         {

diff --git a/...t/DiagramView/components/LogicalOperator/components/CriteriaRightPanel/forms/Cim10Form.ts b/...t/DiagramView/components/LogicalOperator/components/CriteriaRightPanel/forms/Cim10Form.ts
@@ -57,7 +57,7 @@ export const form: () => CriteriaForm<Cim10DataType> = () => ({
           type: 'numberAndComparator',
           label: "Nombre d'occurrences",
           buildInfo: {
-            chipDisplayMethodExtraArgs: [{ type: 'string', value: "Nombre d'occurences" }]
+            chipDisplayMethodExtraArgs: [{ type: 'string', value: "Nombre d'occurrences" }]
           }
         },
         {

diff --git a/...agramView/components/LogicalOperator/components/CriteriaRightPanel/forms/DocumentsForm.ts b/...agramView/components/LogicalOperator/components/CriteriaRightPanel/forms/DocumentsForm.ts
@@ -60,7 +60,7 @@ export const form: () => CriteriaForm<DocumentDataType> = () => ({
           type: 'numberAndComparator',
           label: "Nombre d'occurrences",
           buildInfo: {
-            chipDisplayMethodExtraArgs: [{ type: 'string', value: "Nombre d'occurences" }]
+            chipDisplayMethodExtraArgs: [{ type: 'string', value: "Nombre d'occurrences" }]
           }
         },
         {

diff --git a/...agramView/components/LogicalOperator/components/CriteriaRightPanel/forms/EncounterForm.ts b/...agramView/components/LogicalOperator/components/CriteriaRightPanel/forms/EncounterForm.ts
@@ -77,7 +77,7 @@ export const form: () => CriteriaForm<EncounterDataType> = () => ({
           type: 'numberAndComparator',
           label: "Nombre d'occurrences",
           buildInfo: {
-            chipDisplayMethodExtraArgs: [{ type: 'string', value: "Nombre d'occurences" }]
+            chipDisplayMethodExtraArgs: [{ type: 'string', value: "Nombre d'occurrences" }]
           }
         },
         {

diff --git a/...rt/DiagramView/components/LogicalOperator/components/CriteriaRightPanel/forms/GHMForm.tsx b/...rt/DiagramView/components/LogicalOperator/components/CriteriaRightPanel/forms/GHMForm.tsx
@@ -63,9 +63,9 @@ export const form: () => CriteriaForm<GhmDataType> = () => ({
         {
           valueKey: 'occurrence',
           type: 'numberAndComparator',
-          label: "Nombre d'occurences",
+          label: "Nombre d'occurrences",
           buildInfo: {
-            chipDisplayMethodExtraArgs: [{ type: 'string', value: "Nombre d'occurences" }]
+            chipDisplayMethodExtraArgs: [{ type: 'string', value: "Nombre d'occurrences" }]
           }
         },
         {

diff --git a/.../DiagramView/components/LogicalOperator/components/CriteriaRightPanel/forms/HospitForm.ts b/.../DiagramView/components/LogicalOperator/components/CriteriaRightPanel/forms/HospitForm.ts
@@ -127,9 +127,9 @@ export const form: () => CriteriaForm<HospitDataType> = () => ({
         {
           valueKey: 'occurrence',
           type: 'numberAndComparator',
-          label: "Nombre d'occurences",
+          label: "Nombre d'occurrences",
           buildInfo: {
-            chipDisplayMethodExtraArgs: [{ type: 'string', value: "Nombre d'occurences" }]
+            chipDisplayMethodExtraArgs: [{ type: 'string', value: "Nombre d'occurrences" }]
           }
         },
         {

diff --git a/...DiagramView/components/LogicalOperator/components/CriteriaRightPanel/forms/ImagingForm.ts b/...DiagramView/components/LogicalOperator/components/CriteriaRightPanel/forms/ImagingForm.ts
@@ -85,7 +85,7 @@ export const form: () => CriteriaForm<ImagingDataType> = () => ({
           type: 'numberAndComparator',
           label: "Nombre d'occurrences",
           buildInfo: {
-            chipDisplayMethodExtraArgs: [{ type: 'string', value: "Nombre d'occurences" }]
+            chipDisplayMethodExtraArgs: [{ type: 'string', value: "Nombre d'occurrences" }]
           }
         },
         {

diff --git a/...gramView/components/LogicalOperator/components/CriteriaRightPanel/forms/MedicationForm.ts b/...gramView/components/LogicalOperator/components/CriteriaRightPanel/forms/MedicationForm.ts
@@ -66,7 +66,7 @@ export const form: () => CriteriaForm<MedicationDataType> = () => ({
           type: 'numberAndComparator',
           label: "Nombre d'occurrences",
           buildInfo: {
-            chipDisplayMethodExtraArgs: [{ type: 'reference', value: "Nombre d'occurences" }]
+            chipDisplayMethodExtraArgs: [{ type: 'reference', value: "Nombre d'occurrences" }]
           }
         },
         {

diff --git a/...agramView/components/LogicalOperator/components/CriteriaRightPanel/forms/PregnancyForm.ts b/...agramView/components/LogicalOperator/components/CriteriaRightPanel/forms/PregnancyForm.ts
@@ -76,7 +76,7 @@ export const form: () => CriteriaForm<PregnancyDataType> = () => ({
           type: 'numberAndComparator',
           label: "Nombre d'occurrences",
           buildInfo: {
-            chipDisplayMethodExtraArgs: [{ type: 'string', value: "Nombre d'occurences" }]
+            chipDisplayMethodExtraArgs: [{ type: 'string', value: "Nombre d'occurrences" }]
           }
         },
         {

diff --git a/src/components/ui/Collapse/index.tsx b/src/components/ui/Collapse/index.tsx
@@ -14,6 +14,7 @@ type CollapseProps = {
 
 const Collapse = ({ value = true, title, children, margin = '0 0 5px 0' }: PropsWithChildren<CollapseProps>) => {
   const [checked, setChecked] = useState(value)
+  console.log('test children', children)
 
   return (
     <Grid container direction="column">

diff --git a/src/components/ui/Inputs/CalendarRange/index.tsx b/src/components/ui/Inputs/CalendarRange/index.tsx
@@ -60,7 +60,13 @@ const CalendarRange = ({
       ) : (
         label
       )}
-      <Grid item xs={12} container spacing={2}>
+      <Grid
+        item
+        xs={12}
+        container
+        //TODO: trouver un moyen autre que spacing pour espacer les deux calendar input car rajoute maxWidth : 100% - 16px
+        spacing={2}
+      >
         <Grid item xs={12} md={inline ? 6 : 12}>
           <CalendarInput
             disabled={disabled}