diff --git a/TODO.md b/TODO.md index fe776fb8..1008764d 100644 --- a/TODO.md +++ b/TODO.md @@ -2,6 +2,8 @@ ## Top +- Allow to trigger toasts from HTMX responses using HX-Trigger # see core.js of RADIS + - Before new release -- test job_utils -- Test canceled task/job in test_workers.py @@ -194,4 +196,8 @@ ## RADIS -- Move over to SVG sprites +- In core_layout rename #dialog to #htmx-dialog and #modal to #htmx-modal, also in the core.js and also in all the htmx rendered templates (hx-target="#dialog" to hx-target="#htmx-dialog") +- htmx.on("#htmx-modal", "hidden.bs.modal", () => { +- delete unneeded \_message_modal.html and \_confirm_modal.html +- use HtmxDetails in types.py +- HtmxTemplateView also for RADIS (if needed) diff --git a/adit/batch_query/templates/batch_query/_batch_query_help.html b/adit/batch_query/templates/batch_query/_batch_query_help.html new file mode 100644 index 00000000..5692e3b4 --- /dev/null +++ b/adit/batch_query/templates/batch_query/_batch_query_help.html @@ -0,0 +1,97 @@ +{% load static from static %} +{% load bootstrap_icon from core_extras %} +
diff --git a/adit/batch_query/templates/batch_query/_batch_query_help_modal.html b/adit/batch_query/templates/batch_query/_batch_query_help_modal.html deleted file mode 100644 index 3c23a693..00000000 --- a/adit/batch_query/templates/batch_query/_batch_query_help_modal.html +++ /dev/null @@ -1,92 +0,0 @@ -{% extends "core/_message_modal.html" %} -{% load static from static %} -{% load bootstrap_icon from core_extras %} -{% block modal_title %} - Batch Query Help -{% endblock modal_title %} -{% block modal_body %} -- With a Batch Query you can create a job to find data of multiple studies in a source DICOM / PACS server. Batch - query jobs are put into a queue and will be processed by a worker when the time is right. You will get an Email when - the job is finished (or failed for some reason). -
-- Each batch query job contains several query tasks that define what studies to search for. The search terms must be - specified in an Excel file (.xlsx). The first row of the Excel file must contain the header with the column titles (see below). - Each of the following rows represent a query task. -
-
- Cave!
-
- If PatientID or AccessionNumber contains leading zeros those are relevant as it is not a number but a text
- identifier. So make sure that your Excel file does not remove those leading zeros by setting the column type to text or
- add a single quote ' as prefix to the text cell itself.
-
- These are the columns in the batch file to execute your queries: -
- The patient must be identifiable by either "PatientID" or "PatientName" together with "PatientBirthDate". - The remaining fields are optional and may limit the results for what you really need. -
-- The result of the batch query can be viewed and downloaded from ADIT. The downloaded Excel file contains more data - then what can be viewed on the website. Each result contains the "PatientID" and "StudyInstanceUID", which is - necessary for a batch transfer job. If a "SeriesDescription" or a "SeriesNumber" was provided, the result will also - contain the "SeriesInstanceUID". This downloaded file can be used for a batch transfer. So a batch query job is in - a preparation step for a batch transfer. -
- -{% endblock modal_body %} diff --git a/adit/batch_query/templates/batch_query/batch_query_job_form.html b/adit/batch_query/templates/batch_query/batch_query_job_form.html index c5bf8cd3..0f7baf7e 100644 --- a/adit/batch_query/templates/batch_query/batch_query_job_form.html +++ b/adit/batch_query/templates/batch_query/batch_query_job_form.html @@ -5,7 +5,13 @@- With this form you can create a new batch transfer job to transfer studies from a source server to a destination. - Batch transfer jobs are put into a queue and will be processed by a worker when the time is right. You will get an - Email when the job is finished (or failed for some reason). -
-- Each batch transfer job contains several transfer tasks that define what studies to transfer. This data must be - specified in an Excel file (.xlsx). The first row of the Excel file must contain the header with the - column titles. The following rows contain the data that identifies the studies to transfer. -
-- The required PatientID and StudyInstanceUID can be fetched by doing a "Batch Query". The resulting file of a - batch query can be used for the batch transfer. So a batch query is usually a preparation step for a batch transfer. -
-
- Cave!
-
- If PatientID or AccessionNumber contains leading zeros those are relevant as it is not a number but a text
- identifier. So make sure that your Excel file does not remove those leading zeros by setting the column type to text or
- add a single quote ' as prefix to the text cell itself.
-
- The following columns must be defined in the batch file: -
- The "SeriesInstanceUID" is optional. If provided, only the specified series of the study will be transferred. The - provided pseudonym is optional if you have the permissions to transfer unpseudonymized. It will be set as PatientID - and PatientName. So it is recommended to use cryptic identifier strings (e.g. "XFE3TEW2N"). -
- -{% endblock modal_body %} diff --git a/adit/batch_transfer/templates/batch_transfer/batch_transfer_job_form.html b/adit/batch_transfer/templates/batch_transfer/batch_transfer_job_form.html index 32d9aa96..1b04ebb6 100644 --- a/adit/batch_transfer/templates/batch_transfer/batch_transfer_job_form.html +++ b/adit/batch_transfer/templates/batch_transfer/batch_transfer_job_form.html @@ -5,7 +5,13 @@- With the selective transfer form you can search a source server for studies - and transfer them to a destination server or folder. -
-- You can choose an optional archive password to store the transferred data - in an encrpyted 7z (https://7-zip.org) archive (max. 10 studies). -
-{% endblock modal_body %} diff --git a/adit/selective_transfer/templates/selective_transfer/_selective_transfer_help.html b/adit/selective_transfer/templates/selective_transfer/_selective_transfer_help.html new file mode 100644 index 00000000..a74de143 --- /dev/null +++ b/adit/selective_transfer/templates/selective_transfer/_selective_transfer_help.html @@ -0,0 +1,21 @@ +{% block modal_body %} + +{% endblock modal_body %} diff --git a/adit/selective_transfer/templates/selective_transfer/selective_transfer_job_form.html b/adit/selective_transfer/templates/selective_transfer/selective_transfer_job_form.html index a01f9615..f8d3b498 100644 --- a/adit/selective_transfer/templates/selective_transfer/selective_transfer_job_form.html +++ b/adit/selective_transfer/templates/selective_transfer/selective_transfer_job_form.html @@ -5,7 +5,13 @@- With this feature you can generate an authentication token to authenticate - your third party REST application. -
-
- The token should be included in the request header like this:
-
- Authorization: Token 9944b09199c62bcf9418ad846dd0e4bbdfc6ee4b
-