-
Notifications
You must be signed in to change notification settings - Fork 37
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
delphine
committed
Jul 27, 2023
1 parent
02cf83d
commit 6532378
Showing
6 changed files
with
223 additions
and
79 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,47 +1,202 @@ | ||
| import React, { useState } from 'react' | ||
| import { useDispatch, useSelector } from 'react-redux' | ||
|
|
||
| import { Button, Container, Modal, Row } from 'react-bootstrap' | ||
| import QueryStudies from './QueryStudies' | ||
| import QuerySeries from './QuerySeries' | ||
| import moment from 'moment' | ||
|
|
||
| export default ((onQueryFinished) => { | ||
| const QUERY_STUDIES = 'studies' | ||
| const QUERY_SERIES = 'series' | ||
| import Spinner from '../../CommonComponents/Spinner' | ||
| import CsvLoader from './CsvLoader' | ||
| import QueryTable from './QueryTable' | ||
|
|
||
| const [currentComponent, setCurrentComponent] = useState(QUERY_STUDIES) | ||
| import { addRow, emptyQueryTable, removeQuery } from '../../../actions/TableQuery' | ||
| import { useCustomQuery } from '../../../services/ReactQuery/hooks' | ||
| import apis from '../../../services/apis' | ||
| import { keys } from '../../../model/Constant' | ||
| import { exportCsv } from '../../../tools/CSVExport' | ||
| import { dissmissToast, errorMessage, infoMessage, successMessage, updateToastMessage } from '../../../tools/toastify' | ||
| import { addStudyResult } from '../../../actions/TableResult' | ||
| import EditQueries from './EditQueries' | ||
|
|
||
| const getComponentToDisplay = () => { | ||
| switch (currentComponent) { | ||
| case QUERY_STUDIES: | ||
| return <QueryStudies onQueryStudiesFinished={() => onQueryFinished('studies')}/> | ||
| case QUERY_SERIES: | ||
| return <QuerySeries onQuerySeriesFinished={() => onQueryFinished('series')}/> | ||
| export default ({ onQueryFinished }) => { | ||
|
|
||
| const [openEditModal, setOpenEditModal] = useState(false) | ||
| const [currentRow, setCurrentRow] = useState(null) | ||
| const [selectedRowsIds, setSelectedRowsIds] = useState([]) | ||
|
|
||
| const dispatch = useDispatch() | ||
|
|
||
| const { data: aets, isLoading } = useCustomQuery( | ||
| [keys.AETS_KEY], | ||
| () => apis.aets.getAets(), | ||
| undefined | ||
| ) | ||
| const queries = useSelector(state => state.AutoRetrieveQueryList.queries) | ||
|
|
||
| const onRowClick = (rowId) => { | ||
| setCurrentRow(rowId) | ||
| } | ||
|
|
||
| const removeRows = () => { | ||
| dispatch(removeQuery(selectedRowsIds)); | ||
| } | ||
|
|
||
| const emptyTable = () => { | ||
| dispatch(emptyQueryTable()) | ||
| } | ||
|
|
||
| const onSelectRowsChange = (rowIds) => { | ||
| setSelectedRowsIds(rowIds) | ||
| } | ||
|
|
||
| const onCSVDownload = () => { | ||
| let data = queries.map(row => { | ||
| let formattedDateFrom = typeof row.DateFrom === 'string' ? moment(new Date(row.DateFrom)).format('YYYYMMDD') : '' | ||
| let formattedDateTo = typeof row.DateTo === 'string' ? moment(new Date(row.DateTo)).format('YYYYMMDD') : '' | ||
| return { | ||
| 'Patient Name': row.PatientName, | ||
| 'Patient ID': row.PatientID, | ||
| 'Accession Number': row.AccessionNumber, | ||
| 'Date From': formattedDateFrom, | ||
| 'Date To': formattedDateTo, | ||
| 'Study Description': row.StudyDescription, | ||
| 'Modalities': row.ModalitiesInStudy, | ||
| 'AET': row.Aet | ||
| } | ||
| }) | ||
| exportCsv(data, 'csv', 'queries.csv') | ||
| } | ||
|
|
||
| const makeDicomQuery = async (queryParams) => { | ||
|
|
||
| let DateFrom = queryParams.DateFrom ? queryParams.DateFrom : null | ||
| let DateTo = queryParams.DateTo ? queryParams.DateTo : null | ||
|
|
||
| //Prepare Date string for post data | ||
| let DateString = ''; | ||
| if (DateFrom !== null && DateTo !== null) { | ||
| DateString = DateFrom + '-' + DateTo | ||
| } else if (DateFrom === null && DateTo !== null) { | ||
| DateString = '-' + DateTo | ||
| } else if (DateFrom !== null && DateTo === null) { | ||
| DateString = DateFrom + '-' | ||
| } | ||
|
|
||
| //Prepare POST payload for query (follow Orthanc APIs) | ||
| let queryPost = { | ||
| Level: 'Study', | ||
| Query: { | ||
| PatientName: queryParams.PatientName, | ||
| PatientID: queryParams.PatientID, | ||
| StudyDate: DateString, | ||
| ModalitiesInStudy: queryParams.ModalitiesInStudy, | ||
| StudyDescription: queryParams.StudyDescription, | ||
| AccessionNumber: queryParams.AccessionNumber, | ||
| NumberOfStudyRelatedInstances: '', | ||
| NumberOfStudyRelatedSeries: '' | ||
| } | ||
| } | ||
|
|
||
| //Call Orthanc API to make Query | ||
| let createQueryRessource = await apis.query.dicomQuery(queryParams.Aet, queryPost) | ||
| //Call OrthancToolsJS API to get a parsed answer of the results | ||
| return await apis.query.retrieveAnswer(createQueryRessource.ID) | ||
| } | ||
|
|
||
| const areAllRowsAetDefined = (data) => { | ||
| for (let i = 0; i < data.length; i++) { | ||
| if (data[i].Aet == null || data[i].Aet == "") { | ||
| errorMessage('Missing AET in row ' + i + ' fill it before querying') | ||
| return false | ||
| } | ||
| } | ||
| return true | ||
| } | ||
|
|
||
| const onQueryHandle = async () => { | ||
|
|
||
| const data = queries; | ||
|
|
||
| if (!areAllRowsAetDefined(data)) return | ||
|
|
||
| const toastId = infoMessage('Starting Studies Queries') | ||
|
|
||
| let i = 1 | ||
| for (const query of data) { | ||
| i = i++ | ||
| updateToastMessage(toastId, 'Query study ' + i + '/' + data.length) | ||
| //For each line make dicom query and return results | ||
| try { | ||
| let answeredResults = await makeDicomQuery(query) | ||
| //For each results, fill the result table through Redux | ||
| answeredResults.forEach((answer) => { | ||
| dispatch(addStudyResult(answer)) | ||
| }) | ||
| } catch (err) { | ||
| console.error(err) | ||
| } | ||
|
|
||
| } | ||
|
|
||
| dissmissToast(toastId) | ||
| successMessage('Queries completed') | ||
| onQueryFinished() | ||
| } | ||
|
|
||
| if (isLoading) return <Spinner /> | ||
|
|
||
| return ( | ||
| <Container fluid> | ||
| <Row className='mb-5'> | ||
| <nav className="otjs-navmenu container-fluid"> | ||
| <div className="otjs-navmenu-nav"> | ||
| <li className='col-4 text-center'> | ||
| <Button | ||
| className={currentComponent === QUERY_STUDIES ? 'otjs-navmenu-nav-link link-button-active link-button' : 'otjs-navmenu-nav-link link-button'} | ||
| onClick={() => setCurrentComponent(QUERY_STUDIES)}>Studies Level | ||
| </Button> | ||
| </li> | ||
| <li className='col-4 text-center'> | ||
| <Button | ||
| className={currentComponent === QUERY_SERIES ? 'otjs-navmenu-nav-link link-button-active link-button' : 'otjs-navmenu-nav-link link-button'} | ||
| onClick={() => setCurrentComponent(QUERY_SERIES)}>Series Level | ||
| </Button> | ||
| </li> | ||
| </div> | ||
| </nav> | ||
| </Row> | ||
| <Row> | ||
| {getComponentToDisplay()} | ||
| </Row> | ||
| </Container> | ||
| <> | ||
| <Modal size='xl' show={openEditModal} onHide={()=>setOpenEditModal(false)}> | ||
| <Modal.Header closeButton/> | ||
| <Modal.Title>Edit Queries</Modal.Title> | ||
| <Modal.Body> | ||
| <EditQueries aets={aets} selectedRowsIds={selectedRowsIds}/> | ||
| </Modal.Body> | ||
| </Modal> | ||
| <Container fluid> | ||
| <Row> | ||
| <CsvLoader /> | ||
| </Row> | ||
| <Row className="m-3 d-flex justify-content-around"> | ||
| <Button className="otjs-button otjs-button-blue w-10" | ||
| onClick={() => dispatch(addRow())}> | ||
| Add Query | ||
| </Button> | ||
| <Button onClick={onCSVDownload} className="otjs-button otjs-button-blue w-10"> | ||
| Export CSV | ||
| </Button> | ||
| <Button className="otjs-button otjs-button-orange w-10" | ||
| onClick={() => setOpenEditModal(true)} > | ||
| Edit Selected | ||
| </Button> | ||
| <Button className="otjs-button otjs-button-orange w-10" | ||
| onClick={removeRows} > | ||
| Delete Selected | ||
| </Button> | ||
| <Button className="otjs-button otjs-button-red w-10" | ||
| onClick={emptyTable} > | ||
| Empty Table | ||
| </Button> | ||
| </Row> | ||
| <Row> | ||
| <QueryTable | ||
| queries={queries} | ||
| aets={aets} | ||
| currentRow={currentRow} | ||
| onRowClick={onRowClick} | ||
| onSelectRowsChange={onSelectRowsChange} | ||
| selectedRowIds={selectedRowsIds} | ||
| /> | ||
| </Row> | ||
| <Row className="d-flex justify-content-center mt-5"> | ||
| <Button | ||
| className="otjs-button otjs-button-blue" | ||
| onClick={onQueryHandle} | ||
| > | ||
| Query | ||
| </Button> | ||
| </Row> | ||
| </Container> | ||
| </> | ||
| ) | ||
| }) | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.