From a231a09770b4b5f0c6cdc32f2289fdd17b417448 Mon Sep 17 00:00:00 2001
From: Salim Kanoun <salim.kanoun@gmail.com>
Date: Mon, 3 Jul 2023 22:57:29 +0200
Subject: [PATCH 1/8] small

---
 .../Deployment Sample/OrthancToolsJS/docker-compose.yml         | 2 --
 1 file changed, 2 deletions(-)

diff --git a/Documentation/Deployment Sample/OrthancToolsJS/docker-compose.yml b/Documentation/Deployment Sample/OrthancToolsJS/docker-compose.yml
index 96b0778b..a4eb0ed8 100644
--- a/Documentation/Deployment Sample/OrthancToolsJS/docker-compose.yml	
+++ b/Documentation/Deployment Sample/OrthancToolsJS/docker-compose.yml	
@@ -106,8 +106,6 @@ services:
             ORTHANC__REGISTERED_USERS: |
                     {"salim": "salim"}
 
-
-
 volumes:
         orthanc:
         orthancpacs:

From eb99c11c8d4d33c00236d12bea0c7ce10ce24899 Mon Sep 17 00:00:00 2001
From: Salim Kanoun <salim.kanoun@gmail.com>
Date: Mon, 3 Jul 2023 23:03:22 +0200
Subject: [PATCH 2/8] cmall

---
 .../Deployment Sample/OrthancToolsJS/docker-compose.yml       | 4 ++--
 docker-compose.yml                                            | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Documentation/Deployment Sample/OrthancToolsJS/docker-compose.yml b/Documentation/Deployment Sample/OrthancToolsJS/docker-compose.yml
index a4eb0ed8..add8e07a 100644
--- a/Documentation/Deployment Sample/OrthancToolsJS/docker-compose.yml	
+++ b/Documentation/Deployment Sample/OrthancToolsJS/docker-compose.yml	
@@ -88,8 +88,8 @@ services:
             ORTHANC__DICOM_WEB__ENABLEWADO: "true"
             ORTHANC__DICOM_WEB__WADOROOT: "/wado"
             ORTHANC__DICOM_WEB__SSL: "true"
-            ORTHANC__DICOM_WEB__STUDIESMETADATA: "MainDicomTags"
-            ORTHANC__DICOM_WEB__SERIESMETADATA: "Full"
+            ORTHANC__DICOM_WEB__STUDIES_METADATA: "MainDicomTags"
+            ORTHANC__DICOM_WEB__SERIES_METADATA: "Full"
             ORTHANC__BUILTIN__DECODER__TRANSCODER__ORDER: "Before"
 
     orthanctoolsjspacs:
diff --git a/docker-compose.yml b/docker-compose.yml
index f7c0001c..06204297 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -42,8 +42,8 @@ services:
             ORTHANC__DICOM_WEB__ENABLEWADO: "true"
             ORTHANC__DICOM_WEB__WADOROOT: "/wado"
             ORTHANC__DICOM_WEB__SSL: "true"
-            ORTHANC__DICOM_WEB__STUDIESMETADATA: "MainDicomTags"
-            ORTHANC__DICOM_WEB__SERIESMETADATA: "Full"
+            ORTHANC__DICOM_WEB__STUDIES_METADATA: "MainDicomTags"
+            ORTHANC__DICOM_WEB__SERIES_METADATA: "Full"
 
 volumes:
         orthanc:

From 2b40c25475afef2107c3a45b80c32a76974f80c1 Mon Sep 17 00:00:00 2001
From: Salim Kanoun <salim.kanoun@gmail.com>
Date: Wed, 5 Jul 2023 13:14:57 +0200
Subject: [PATCH 3/8] add export of number of related series and instance at
 study export

---
 FrontEnd/src/components/AutoQuery/Results/ResultsStudies.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/FrontEnd/src/components/AutoQuery/Results/ResultsStudies.js b/FrontEnd/src/components/AutoQuery/Results/ResultsStudies.js
index d8c9f497..145b15f0 100644
--- a/FrontEnd/src/components/AutoQuery/Results/ResultsStudies.js
+++ b/FrontEnd/src/components/AutoQuery/Results/ResultsStudies.js
@@ -25,7 +25,11 @@ export default () => {
                 'DateTo': row.StudyDate,
                 'Study Description': row.StudyDescription,
                 'Modalities': row.ModalitiesInStudy,
-                'AET': row.OriginAET
+                'AET': row.OriginAET,
+                'StudyInstanceUID' : row.StudyInstanceUID,
+                'Requested Procedure Description' : row.RequestedProcedureDescription,
+                'Number Of Related Series' : row.NumberOfStudyRelatedSeries,
+                'Number Of Related Instances' : row.NumberOfStudyRelatedInstances
             }
         })
         exportCsv(data, 'csv', 'queries.csv')

From 3ba77117abcf560d961680cc7b61169e1c1c0c6b Mon Sep 17 00:00:00 2001
From: delphinedecap <103040342+delphinedecap@users.noreply.github.com>
Date: Wed, 5 Jul 2023 14:20:22 +0200
Subject: [PATCH 4/8] export series

---
 .../AutoQuery/Results/ResultsSeries.js        | 21 +++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/FrontEnd/src/components/AutoQuery/Results/ResultsSeries.js b/FrontEnd/src/components/AutoQuery/Results/ResultsSeries.js
index e66eb353..e73db0d6 100644
--- a/FrontEnd/src/components/AutoQuery/Results/ResultsSeries.js
+++ b/FrontEnd/src/components/AutoQuery/Results/ResultsSeries.js
@@ -28,6 +28,26 @@ export default () => {
 
     const [selectedRowIds, setSelectedRowIds] = useState([])
 
+    const onCSVDownload = () => {
+
+        let result = Object.values(data).map(row => {
+            return {
+                'Patient Name': row.PatientName,
+                'Patient ID': row.PatientID,
+                'Accession Number': row.AccessionNumber,
+                'Study Date': row.StudyDate,
+                'Study Description': row.StudyDescription ,
+                'Requested Procedure': row.RequestedProcedureDescription,
+                'Series Instance UID': row.SerieInstanceUID,
+                'Series Description': row.SeriesDescription,
+                'Modalities': row.ModalitiesInSerie,
+                'Number of Instances': row.NumberOfSeriesRelatedInstances,
+                'AET': row.OriginAET
+            }
+        })
+        exportCsv(result, 'csv', 'queries.csv')
+    }
+
     const queryAndAddSeriesDetails = async (studyUID, aet) => {
         let queryData = {
             Level: 'Series',
@@ -88,6 +108,7 @@ export default () => {
     return (
         <Container>
             <Row className='d-flex justify-content-around mb-3'>
+            <Button onClick={onCSVDownload} className="otjs-button otjs-button-blue w-10">Export CSV</Button>
                 <Button className="otjs-button otjs-button-orange w-10"
                     onClick={deleteRowsHandle} >
                     Delete Selected

From ce5ae7eff274f7d208ca7610b3dafb1fc6e5d360 Mon Sep 17 00:00:00 2001
From: Salim Kanoun <salim.kanoun@gmail.com>
Date: Wed, 5 Jul 2023 17:06:41 +0200
Subject: [PATCH 5/8] query progression feedback

---
 FrontEnd/src/components/AutoQuery/Query/QueryRoot.js      | 8 ++++----
 .../src/components/AutoQuery/Results/ResultsSeries.js     | 6 +++---
 FrontEnd/src/tools/toastify.js                            | 5 +++--
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/FrontEnd/src/components/AutoQuery/Query/QueryRoot.js b/FrontEnd/src/components/AutoQuery/Query/QueryRoot.js
index 48aadcb6..9e582a40 100644
--- a/FrontEnd/src/components/AutoQuery/Query/QueryRoot.js
+++ b/FrontEnd/src/components/AutoQuery/Query/QueryRoot.js
@@ -13,7 +13,7 @@ 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, updateToast } from '../../../tools/toastify'
+import { dissmissToast, errorMessage, infoMessage, successMessage, updateToastMessage } from '../../../tools/toastify'
 import { addStudyResult } from '../../../actions/TableResult'
 import EditQueries from './EditQueries'
 
@@ -120,10 +120,10 @@ export default ({ onQueryFinished }) => {
 
         const toastId = infoMessage('Starting Studies Queries')
 
-        let i = 0
+        let i = 1
         for (const query of data) {
-            i++
-            updateToast(toastId, 'Query study ' + i + '/' + data.length)
+            i = i++
+            updateToastMessage(toastId, 'Query study ' + i + '/' + data.length)
             //For each line make dicom query and return results
             try {
                 let answeredResults = await makeDicomQuery(query)
diff --git a/FrontEnd/src/components/AutoQuery/Results/ResultsSeries.js b/FrontEnd/src/components/AutoQuery/Results/ResultsSeries.js
index e73db0d6..5ef95813 100644
--- a/FrontEnd/src/components/AutoQuery/Results/ResultsSeries.js
+++ b/FrontEnd/src/components/AutoQuery/Results/ResultsSeries.js
@@ -1,7 +1,7 @@
 import React, { useEffect, useMemo, useState } from "react"
 import { useDispatch, useSelector } from "react-redux"
 
-import { errorMessage, infoMessage, updateToast } from "../../../tools/toastify"
+import { errorMessage, infoMessage, updateToastMessage } from "../../../tools/toastify"
 import { addSeriesDetails, emptyResultsTable, removeSeriesResult } from "../../../actions/TableResult"
 import ResultsSeriesTable from "./ResultsSeriesTable"
 
@@ -84,9 +84,9 @@ export default () => {
                 const toastId = infoMessage('Starting Series Fetching');
                 for (let i = 0; i < missingSeriesDetails.length; i++) {
                     await queryAndAddSeriesDetails(missingSeriesDetails[i].StudyInstanceUID, missingSeriesDetails[i].OriginAET)
-                    updateToast(toastId, 'Queried series ' + (i + 1) + '/' + emptyResultArray.length);
+                    updateToastMessage(toastId, 'Queried series ' + (i + 1) + '/' + missingSeriesDetails.length);
                 }
-                updateToast(toastId, 'Queried series Finihsed');
+                updateToastMessage(toastId, 'Queried series Finihsed');
             }
 
         }
diff --git a/FrontEnd/src/tools/toastify.js b/FrontEnd/src/tools/toastify.js
index fdfdbe56..8c79f918 100644
--- a/FrontEnd/src/tools/toastify.js
+++ b/FrontEnd/src/tools/toastify.js
@@ -12,9 +12,10 @@ export const errorMessage = (message) => {
     toast.error(message, { containerId: 'message' })
 }
 
-export const updateToast = (toastId, message) => {
+export const updateToastMessage = (toastId, message) => {
     toast.update(toastId, {
-        render: message
+        render: message,
+        containerId : 'message'
     });
 }
 

From 1174b917ab244d6f9f586743215fefd707a24206 Mon Sep 17 00:00:00 2001
From: Salim Kanoun <salim.kanoun@gmail.com>
Date: Wed, 5 Jul 2023 17:13:51 +0200
Subject: [PATCH 6/8] fix series export and csvs

---
 FrontEnd/src/components/AutoQuery/Query/QueryRoot.js        | 4 ++--
 FrontEnd/src/components/AutoQuery/Results/ResultsSeries.js  | 5 +++--
 FrontEnd/src/components/AutoQuery/Results/ResultsStudies.js | 4 ++--
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/FrontEnd/src/components/AutoQuery/Query/QueryRoot.js b/FrontEnd/src/components/AutoQuery/Query/QueryRoot.js
index 9e582a40..9cf889bc 100644
--- a/FrontEnd/src/components/AutoQuery/Query/QueryRoot.js
+++ b/FrontEnd/src/components/AutoQuery/Query/QueryRoot.js
@@ -56,8 +56,8 @@ export default ({ onQueryFinished }) => {
                 'Patient Name': row.PatientName,
                 'Patient ID': row.PatientID,
                 'Accession Number': row.AccessionNumber,
-                'DateFrom': formattedDateFrom,
-                'DateTo': formattedDateTo,
+                'Date From': formattedDateFrom,
+                'Date To': formattedDateTo,
                 'Study Description': row.StudyDescription,
                 'Modalities': row.ModalitiesInStudy,
                 'AET': row.Aet
diff --git a/FrontEnd/src/components/AutoQuery/Results/ResultsSeries.js b/FrontEnd/src/components/AutoQuery/Results/ResultsSeries.js
index 5ef95813..1b98f941 100644
--- a/FrontEnd/src/components/AutoQuery/Results/ResultsSeries.js
+++ b/FrontEnd/src/components/AutoQuery/Results/ResultsSeries.js
@@ -7,6 +7,7 @@ import ResultsSeriesTable from "./ResultsSeriesTable"
 
 import apis from "../../../services/apis"
 import { Button, Container, Row } from "react-bootstrap"
+import { exportCsv } from "../../../tools/CSVExport"
 
 export default () => {
 
@@ -38,9 +39,9 @@ export default () => {
                 'Study Date': row.StudyDate,
                 'Study Description': row.StudyDescription ,
                 'Requested Procedure': row.RequestedProcedureDescription,
-                'Series Instance UID': row.SerieInstanceUID,
+                'Series Instance UID': row.SeriesInstanceUID,
                 'Series Description': row.SeriesDescription,
-                'Modalities': row.ModalitiesInSerie,
+                'Modalities': row.Modality,
                 'Number of Instances': row.NumberOfSeriesRelatedInstances,
                 'AET': row.OriginAET
             }
diff --git a/FrontEnd/src/components/AutoQuery/Results/ResultsStudies.js b/FrontEnd/src/components/AutoQuery/Results/ResultsStudies.js
index 145b15f0..1a770a80 100644
--- a/FrontEnd/src/components/AutoQuery/Results/ResultsStudies.js
+++ b/FrontEnd/src/components/AutoQuery/Results/ResultsStudies.js
@@ -21,8 +21,8 @@ export default () => {
                 'Patient Name': row.PatientName,
                 'Patient ID': row.PatientID,
                 'Accession Number': row.AccessionNumber,
-                'DateFrom': row.StudyDate,
-                'DateTo': row.StudyDate,
+                'Date From': row.StudyDate,
+                'Date To': row.StudyDate,
                 'Study Description': row.StudyDescription,
                 'Modalities': row.ModalitiesInStudy,
                 'AET': row.OriginAET,

From 16a80c787422b2514440fbd43a389e927d2eb0fb Mon Sep 17 00:00:00 2001
From: Salim Kanoun <salim.kanoun@gmail.com>
Date: Wed, 5 Jul 2023 17:30:27 +0200
Subject: [PATCH 7/8] fix retrieve labels

---
 BackEnd/controllers/authentication.js | 2 +-
 BackEnd/model/Users.js                | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/BackEnd/controllers/authentication.js b/BackEnd/controllers/authentication.js
index 47b59681..731e3396 100644
--- a/BackEnd/controllers/authentication.js
+++ b/BackEnd/controllers/authentication.js
@@ -17,7 +17,7 @@ const login = async function (req, res) {
     let infosUser = await userObject.getUserRight()
     let payload = {
       username: body.username,
-      name: infosUser.name,
+      roleName: infosUser.name,
       roles: {
         admin: infosUser.admin,
         import: infosUser.import,
diff --git a/BackEnd/model/Users.js b/BackEnd/model/Users.js
index 8b0ea291..d8dd7d6d 100644
--- a/BackEnd/model/Users.js
+++ b/BackEnd/model/Users.js
@@ -199,6 +199,7 @@ class Users {
                 if (role.modify === false) role.modify = currentRole.modify
                 if (role.cd_burner === false) role.cd_burner = currentRole.cd_burner
                 if (role.admin === false) role.admin = currentRole.admin
+                role.name = currentRole
 
             }
 

From f756279b015f30b3857a603b46ab7d736f3a96da Mon Sep 17 00:00:00 2001
From: Salim Kanoun <salim.kanoun@gmail.com>
Date: Wed, 5 Jul 2023 17:44:36 +0200
Subject: [PATCH 8/8] fix auto fill anon

---
 FrontEnd/src/components/Anonymize/Anonymize/AnonymizePanel.js   | 2 +-
 .../src/components/Anonymize/Anonymize/TablePatientAnonymize.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/FrontEnd/src/components/Anonymize/Anonymize/AnonymizePanel.js b/FrontEnd/src/components/Anonymize/Anonymize/AnonymizePanel.js
index cc874444..eef58c84 100644
--- a/FrontEnd/src/components/Anonymize/Anonymize/AnonymizePanel.js
+++ b/FrontEnd/src/components/Anonymize/Anonymize/AnonymizePanel.js
@@ -42,7 +42,7 @@ export default () => {
             ? study.newAccessionNumber
             : "OrthancToolsJS",
         })),
-    [anonList.length, currentPatient]
+    [JSON.stringify(anonList), currentPatient]
   );
 
   const testAllId = () => {
diff --git a/FrontEnd/src/components/Anonymize/Anonymize/TablePatientAnonymize.js b/FrontEnd/src/components/Anonymize/Anonymize/TablePatientAnonymize.js
index 083fce5a..ec5b69df 100644
--- a/FrontEnd/src/components/Anonymize/Anonymize/TablePatientAnonymize.js
+++ b/FrontEnd/src/components/Anonymize/Anonymize/TablePatientAnonymize.js
@@ -12,7 +12,7 @@ export default ({ rowStyle, setCurrentPatient }) => {
 
     const anonList = useSelector(state => state.AnonList.anonList)
 
-    const patients = useMemo(() => studyArrayToPatientArray(anonList), [anonList.length])
+    const patients = useMemo(() => studyArrayToPatientArray(anonList), [JSON.stringify(anonList)])
 
     const onRemovePatient = (PatientOrthancID) => {
         dispatch(removePatientFromAnonList(PatientOrthancID))