fix: fix some bug with cohort-rights and pass biology research value …

…in float
aphp · Jan 3, 2024 · 597e078 · 597e078
1 parent 3583a70
commit 597e078
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/...LogicalOperator/components/CriteriaRightPanel/BiologyForm/components/Form/BiologyForm.tsx b/...LogicalOperator/components/CriteriaRightPanel/BiologyForm/components/Form/BiologyForm.tsx
@@ -248,7 +248,7 @@ const BiologyForm: React.FC<BiologyFormProps> = (props) => {
                 id="criteria-value"
                 variant="outlined"
                 value={currentState.valueMin}
-                onChange={(e) => onChangeValue('valueMin', parseInt(e.target.value))}
+                onChange={(e) => onChangeValue('valueMin', parseFloat(e.target.value))}
                 placeholder={currentState.valueComparator === Comparators.BETWEEN ? 'Valeur minimale' : '0'}
                 disabled={!allowSearchByValue}
               />
@@ -262,7 +262,7 @@ const BiologyForm: React.FC<BiologyFormProps> = (props) => {
                   id="criteria-value"
                   variant="outlined"
                   value={currentState.valueMax}
-                  onChange={(e) => onChangeValue('valueMax', parseInt(e.target.value))}
+                  onChange={(e) => onChangeValue('valueMax', parseFloat(e.target.value))}
                   placeholder="Valeur maximale"
                   disabled={!allowSearchByValue}
                 />

diff --git a/src/components/CreationCohort/Modals/ModalCreateNewRequest/ModalCreateNewRequest.tsx b/src/components/CreationCohort/Modals/ModalCreateNewRequest/ModalCreateNewRequest.tsx
@@ -37,7 +37,7 @@ const ModalCreateNewRequest: React.FC<{
 }> = ({ onClose }) => {
   const navigate = useNavigate()
   const dispatch = useAppDispatch()
-
+  const url = window.location.href && window.location.href.includes('/cohort/new') ? true : false
   const requestState = useAppSelector((state) => state.request)
   const _projectsList = useAppSelector((state) => state.project.projectsList)
 
@@ -214,10 +214,12 @@ const ModalCreateNewRequest: React.FC<{
             <Button disabled={loading} onClick={() => setDeletionConfirmation(true)} style={{ color: '#dc3545' }}>
               Supprimer
             </Button>
-          ) : (
+          ) : url ? (
             <Button variant="contained" disabled={loading} onClick={() => setTab(tab === 'form' ? 'open' : 'form')}>
               {tab === 'form' ? 'Ouvrir' : 'Nouvelle requête'}
             </Button>
+          ) : (
+            <></>
           )}
 
           <Grid style={{ flex: 1 }} />

diff --git a/src/services/aphp/serviceCohorts.ts b/src/services/aphp/serviceCohorts.ts
@@ -620,7 +620,8 @@ const servicesCohorts: IServiceCohorts = {
     try {
       const ids = cohorts
         .map((cohort) => cohort.fhir_group_id)
-        .filter((id) => id !== '' || id !== undefined) as string[]
+        .filter((id) => id !== undefined || id !== '')
+        .filter((i) => i !== '') as string[]
       if (ids.length === 0) return []
       const rightsResponse = await fetchCohortAccesses(ids)
       return cohorts.map((cohort) => {