Use Worklist Label (0074,1202) instead of MWL SCP AET for separating…

… MWL dcm4che/dcm4chee-arc-light#4015

docs/networking/config/archiveAttributeCoercion.rst

@@ -86,11 +86,11 @@ Archive Attribute Coercion of received/sent DIMSE
 
     (dcmMergeMWLSCP)"
     "
-    .. _dcmMergeLocalMWLSCP:
+    .. _dcmMWLWorklistLabel:
 
-    :ref:`Merge Local MWL SCP(s) <dcmMergeLocalMWLSCP>`",string,"AE Title of archive's MWL SCP used to lookup MWL Item to coerce request attributes of received objects. If absent, the Archive DB is queried for a matching MWL item provided by any Archive MWL AE.
+    :ref:`Merge MWL Worklist Label <dcmMWLWorklistLabel>`",string,"Only consider MWL items with this or no Worklist Label (0074,1202) in the Archive DB to coerce request attributes of received objects. If absent, the Archive DB is queried for a matching MWL item provided by any Archive MWL AE.
 
-    (dcmMergeLocalMWLSCP)"
+    (dcmMWLWorklistLabel)"
     "
     .. _dcmMergeLocalMWLWithStatus:
 

docs/networking/config/archiveHL7Application.rst

@@ -14,18 +14,18 @@ DICOM Archive HL7 Application related information
 
     (dicomAETitle)"
     "
-    .. _dcmDestinationAE:
-
-    :ref:`Destination MWL SCP <dcmDestinationAE>`",string,"AE Title of local MWL SCP fed/updated by HL7v2 Order message received by this HL7 Receiver. If no AE Title is specified, the created MWL item will be provided by all configured MWL SCPs of the archive.
-
-    (dcmDestinationAE)"
-    "
     .. _dcmRecordAttributeModification:
 
     :ref:`Record Attribute Modification <dcmRecordAttributeModification>`",boolean,"Indicates if modifications of attributes of stored objects by this HL7 Application are recorded in Items of the Original Attributes Sequence. Overwrites value specified on Device level.
 
     (dcmRecordAttributeModification)"
     "
+    .. _dcmMWLWorklistLabel:
+
+    :ref:`MWL Worklist Label <dcmMWLWorklistLabel>`",string,"Value of Worklist Label (0074,1202) of created MWL items on receive of HL7 Order messages. If absent, created MWL items are not bound to a particular MWL Worklist and are provided by all Archive AEs with MWL SCP Transfer Capability.
+
+    (dcmMWLWorklistLabel)"
+    "
     .. _dcmMWLAccessionNumberGenerator:
 
     :ref:`MWL Accession Number Generator <dcmMWLAccessionNumberGenerator>`",string,"Identifies ID Generator to supplement missing Accession Numbers of Scheduled Procedures Steps created on receive of HL7 Order messages. Overwrites value specified on Device level.

docs/networking/config/archiveNetworkAE.rst

@@ -404,6 +404,12 @@ DICOM Archive Network AE related information
 
     (dcmDefaultCharacterSet)"
     "
+    .. _dcmMWLWorklistLabel:
+
+    :ref:`MWL Worklist Label <dcmMWLWorklistLabel>`",string,"Only consider MWL items with this or no Worklist Label (0074,1202) for matching by this Archive AE acting as MWP SCP. If absent, MWL items with any Value of Worklist Label (0074,1202) are considered for matching by this Archive AE acting as MWL SCP.
+
+    (dcmMWLWorklistLabel)"
+    "
     .. _dcmUPSWorklistLabel:
 
     :ref:`UPS Worklist Label <dcmUPSWorklistLabel>`",string,"Value of Worklist Label (0074,1202) of created UPS by this Network AE, if the UPS Push SCU or UPS-RS User Agent does not provide a value for this attribute. If absent, the AE Title of the receiving AE will be used. Overwrites value specified on Device level.
@@ -672,17 +678,3 @@ DICOM Archive Network AE related information
     ":doc:`storeAccessControlIDRule` (s)",object,"Store Access Control Rules applied to Studies received by this AE. Supplements Store Access Control Rules specified on Device level."
     ":doc:`upsOnStore` (s)",object,"UPS on Store Rules applied to DICOM objects received by this AE. Supplements UPS on Store Rules specified on Device level."
     ":doc:`upsOnUPSCompleted` (s)",object,"UPS on UPS Completed Rules applied to UPS managed by this AE. Supplements UPS on UPS Completed Rules specified on Device level."
-
-.. toctree::
-
-    exportRule
-    exportPriorsRule
-    mppsForwardRule
-    rsForwardRule
-    archiveCompressionRule
-    archiveAttributeCoercion
-    archiveAttributeCoercion2
-    studyRetentionPolicy
-    storeAccessControlIDRule
-    upsOnStore
-    upsOnUPSCompleted

docs/networking/config/device.rst

@@ -102,9 +102,9 @@ DICOM Device related information
 
 	- on DICOM (MWl) C-FIND requests from external systems to invoking archive device
 
-	- on DICOM (MWl) C-FIND requests from invoking archive device to external systems
+	- on DICOM (MWl) C-FIND requests from invoking archive device to external systems 
 
-	- on DICOM (MWl) C-FIND responses from external systems to invoking archive device.
+	- on DICOM (MWl) C-FIND responses from external systems to invoking archive device. 
 
 	Format: {Issuer of Patient ID}[&{UniversalEntityID}&{UniversalEntityIDType}]
 

docs/networking/config/mwlImport.rst

@@ -26,11 +26,11 @@ Specifies import of Scheduled Procedure Step from external MWL SCP
 
     (dcmMergeMWLSCP)"
     "
-    .. _dcmDestinationAE:
+    .. _dcmMWLWorklistLabel:
 
-    :ref:`Destination MWL SCP <dcmDestinationAE>`",string,"AE Title of local MWL SCP feeded/updated by Scheduled Procedure Steps returned by external MWL SCP.
+    :ref:`MWL Worklist Label <dcmMWLWorklistLabel>`",string,"Value of Worklist Label (0074,1202) of imported MWL items fetched from Source MWL SCP. If absent, imported MWL items are provided by all MWL SCP Archive Network AEs.
 
-    (dcmDestinationAE)"
+    (dcmMWLWorklistLabel)"
     "
     .. _dcmDuration:
 

docs/networking/config/uiConfig.rst

@@ -45,6 +45,18 @@ UI Configuration
 
     (dcmuiDateTimeFormat)"
     "
+    .. _dcmuiHideClock:
+
+    :ref:`Hide Clock <dcmuiHideClock>`",boolean,"Set to true if you want to hide the clock in the UI
+
+    (dcmuiHideClock)"
+    "
+    .. _dcmuiPageTitle:
+
+    :ref:`Page Title <dcmuiPageTitle>`",string,"If set, it will be used as UI page Title ( The Text shown in the Tab of the Browser ) 
+
+    (dcmuiPageTitle)"
+    "
     .. _dcmuiPersonNameFormat:
 
     :ref:`Format Person Name <dcmuiPersonNameFormat>`",string,"Here you can format the person Name in the UI by using:{FAMILY-NAME}, {GIVEN-NAME}, {MIDDLE-NAME}, {NAME-PREFIX}, {NAME-SUFFIX} for Alphabetic, or by appending 'I_' for the Ideographic and 'P_' for the Phonetic version like {P_FAMILY-NAME}, {I_NAME-SUFFIX}

docs/networking/config/uiTable.rst

@@ -1,37 +1,43 @@
-UI Study Table Configuration
-============================
+UI Table Configuration
+======================
 Study Table configuration for the pro version
 
 .. tabularcolumns:: |p{4cm}|l|p{8cm}|
-.. csv-table:: UI Study Table Configuration Attributes (LDAP Object: dcmUiTable)
+.. csv-table:: UI Table Configuration Attributes (LDAP Object: dcmUiTable)
     :header: Name, Type, Description (LDAP Attribute)
     :widths: 23, 7, 70
 
     "
-    .. _dcmuiStudyTableConfigName:
+    .. _dcmuiTableConfigName:
 
-    :ref:`Configuration Name <dcmuiStudyTableConfigName>`",string,"UI Study Table Configuration Name
+    :ref:`Configuration Name <dcmuiTableConfigName>`",string,"UI  Table Configuration Name
 
-    (dcmuiStudyTableConfigName)"
+    (dcmuiTableConfigName)"
     "
-    .. _dcmuiStudyTableConfigUsername:
+    .. _dcmuiTableConfigUsername:
 
-    :ref:`Username <dcmuiStudyTableConfigUsername>`",string,"Username to which this set should be available
+    :ref:`Username(s) <dcmuiTableConfigUsername>`",string,"Username to which this set should be available
 
-    (dcmuiStudyTableConfigUsername)"
+    (dcmuiTableConfigUsername)"
     "
-    .. _dcmuiStudyTableConfigRoles:
+    .. _dcmuiTableConfigRoles:
 
-    :ref:`Role <dcmuiStudyTableConfigRoles>`",string,"Username role that can use this Set ( If you set the username, the role will be ignored )
+    :ref:`Role(s) <dcmuiTableConfigRoles>`",string,"Username role that can use this Set ( If you set the username, the role will be ignored )
 
-    (dcmuiStudyTableConfigRoles)"
+    (dcmuiTableConfigRoles)"
     "
-    .. _dcmuiStudyTableConfigIsDefault:
+    .. _dcmuiTableID:
 
-    :ref:`Is Default <dcmuiStudyTableConfigIsDefault>`",boolean,"Set this Column-Set to the default one. (Make sure that only one of the Set - siblings child is set to default).
+    :ref:`Table ID <dcmuiTableID>`",string,"The ID of the Table in the UI for which the config should be effective
 
-    (dcmuiStudyTableConfigIsDefault)"
-    ":doc:`uiTableColumns` (s)",object,"Define Study Table Columns"
+    (dcmuiTableID)"
+    "
+    .. _dcmuiTableConfigIsDefault:
+
+    :ref:`Is Default <dcmuiTableConfigIsDefault>`",boolean,"Set this Column-Set to the default one. (Make sure that only one of the Set - siblings child is set to default).
+
+    (dcmuiTableConfigIsDefault)"
+    ":doc:`uiTableColumns` (s)",object,"Define Table Columns"
 
 .. toctree::
 

docs/networking/config/uiTableColumns.rst

@@ -14,6 +14,12 @@ Study Table Columns
 
     (dcmuiColumnName)"
     "
+    .. _dcmuiColumnId:
+
+    :ref:`Column ID <dcmuiColumnId>`",string,"Every possible column that is used in the UI, has and ID, by using the ID you can change some of the properties of that Column, like Name, Description, Order or width
+
+    (dcmuiColumnId)"
+    "
     .. _dcmuiColumnTitle:
 
     :ref:`Column Description <dcmuiColumnTitle>`",string,"Description of the Column, shown on hover
@@ -40,6 +46,6 @@ Study Table Columns
     "
     .. _dcmuiColumnOrder:
 
-    :ref:`Order of the Column <dcmuiColumnOrder>`",string,"Order of the Column
+    :ref:`Order of the Column <dcmuiColumnOrder>`",number,"Order of the Column
 
     (dcmuiColumnOrder)"