dcm4che/dcm4chee-arc-light#4174 : UI Navigation : Upload DICOM / Bulk…

…data files dialog window broken #4174

src/main/webapp/assets/locale/hi.json

@@ -2391,9 +2391,9 @@
     "upload-dicom.choose_dicom_files_to_upload_title": "अपलोड करने के लिए DICOM फ़ाइलें चुनें",
     "upload-dicom.select_the_ae_title": "AE का नाम चुने:",
     "upload-dicom.title": "DICOM डेटा अपलोड करें ।",
-    "upload-file.title": "मरीज़ पर bulkdata अपलोड करें ।",
-    "upload-file.title_upload_study": "Upload bulkdata files to study",
-    "upload-file.title_upload_series": "Upload bulkdata files to series",
+    "upload-file.title": "मरीज़ पर बल्क डेटा फ़ाइल अपलोड करें ।",
+    "upload-file.title_upload_study": "स्टडीपर बल्क डेटा फ़ाइल अपलोड करें ।",
+    "upload-file.title_upload_series": "सीरीजपर बल्क डेटा फ़ाइल अपलोड करें ।",
     "upload-files.gif_with_multi_frames_in_it": "मल्टी फ्रेम GIF",
     "upload-files.imported_": "आयातित ",
     "upload-files.no_web_application_with_the_web_service_class_stow_rs_found_in_this_device": "इस डिवाइस में 'STOW-RS' वेब सेवा वर्ग के वेब अनुप्रयोग नहीं मिले ।",

src/main/webapp/assets/locale/it.json

@@ -2393,8 +2393,8 @@
 		"upload-dicom.select_the_ae_title": "Seleziona il titolo ae:",
 		"upload-dicom.title": "Carica i dati DICOM",
 		"upload-file.title": "Carica bulkdata nello pazienti",
-		"upload-file.title_upload_study": "Upload bulkdata files to study",
-		"upload-file.title_upload_series": "Upload bulkdata files to series",
+		"upload-file.title_upload_study": "Carica bulkdata files nello studio",
+		"upload-file.title_upload_series": "Carica bulkdata files nello serie",
 		"upload-files.gif_with_multi_frames_in_it": "Gif con dentro più fotogrammi ",
 		"upload-files.imported_": "Importato ",
 		"upload-files.no_web_application_with_the_web_service_class_stow_rs_found_in_this_device": "Nessuna applicazione Web con la classe di servizio Web \"STOW_RS\" trovata in questo dispositivo",

src/main/webapp/assets/locale/ja.json

@@ -2392,9 +2392,9 @@
     "upload-dicom.choose_dicom_files_to_upload_title": "アップロード するために DICOM ファイルを 選択 する",
     "upload-dicom.select_the_ae_title": "AE タイトルを 選択 する:",
     "upload-dicom.title": "DICOM データを アップロード する",
-    "upload-file.title": "bulkdataを 患者に アップロード する",
-    "upload-file.title_upload_study": "Upload bulkdata files to study",
-    "upload-file.title_upload_series": "Upload bulkdata files to series",
+    "upload-file.title": "バルクデータを 患者に アップロード する",
+    "upload-file.title_upload_study": "バルクデータを 検査に アップロード する",
+    "upload-file.title_upload_series": "バルクデータを シリーズに アップロード する",
     "upload-files.gif_with_multi_frames_in_it": "マルチ フレームを 含む GIF",
     "upload-files.imported_": "インポート済み ",
     "upload-files.no_web_application_with_the_web_service_class_stow_rs_found_in_this_device": "この デバイスに ウェブ サービス クラス \"STOW_RS\" もって ウェブ アプリケーション サービスが 見つかりません",

src/main/webapp/assets/locale/mr.json

@@ -2392,9 +2392,9 @@
     "upload-dicom.choose_dicom_files_to_upload_title": "अपलोड करण्यासाठी DICOM फायली निवडा",
     "upload-dicom.select_the_ae_title": "AE चे शीर्षक निवडा:",
     "upload-dicom.title": "DICOM डेटा अपलोड करा",
-    "upload-file.title": "रूग्णावर bulkdata फाइल अपलोड करा",
-    "upload-file.title_upload_study": "Upload bulkdata files to study",
-    "upload-file.title_upload_series": "Upload bulkdata files to series",
+    "upload-file.title": "रूग्णावर बल्क डेटा फाइल अपलोड करा",
+    "upload-file.title_upload_study": "अभ्यासावर बल्क डेटा फाइल अपलोड करा",
+    "upload-file.title_upload_series": "मालिकावर बल्क डेटा फाइल अपलोड करा",
     "upload-files.gif_with_multi_frames_in_it": "मल्टी फ्रेमचे GIF",
     "upload-files.imported_": "आयात केले ",
     "upload-files.no_web_application_with_the_web_service_class_stow_rs_found_in_this_device": "या डिव्हाइसमध्ये वेब सेवा वर्ग \"STOW_RS\" चे कोणताही वेब अनुप्रयोग आढळला नाही",

src/main/webapp/assets/locale/ru.json

@@ -2396,8 +2396,8 @@
     "upload-dicom.select_the_ae_title" : "Выбрать ae заголовок:",
     "upload-dicom.title" : "Загрузка ДАЙКОМ данных",
     "upload-file.title" : "Загрузить файлы bulkdata в пациентов",
-    "upload-file.title_upload_study": "Upload bulkdata files to study",
-    "upload-file.title_upload_series": "Upload bulkdata files to series",
+    "upload-file.title_upload_study": "Загрузить файлы bulkdata в исследований",
+    "upload-file.title_upload_series": "Загрузить файлы bulkdata в Серию",
     "upload-files.gif_with_multi_frames_in_it" : "Gif с несколькими кадрами внутри",
     "upload-files.imported_" : "Импортированный ",
     "upload-files.no_web_application_with_the_web_service_class_stow_rs_found_in_this_device" : "На этом устройстве не найдено Веб-приложение с Классом Веб-службы STOW_RS",

src/main/webapp/assets/locale/zh.json

@@ -2355,8 +2355,8 @@
     "upload-dicom.select_the_ae_title": "选择AE标题",
     "upload-dicom.title": "上传DICOM数据",
     "upload-file.title": "上传 bulkdata 进行患者",
-    "upload-file.title_upload_study": "Upload bulkdata files to study",
-    "upload-file.title_upload_series": "Upload bulkdata files to series",
+    "upload-file.title_upload_study": "上传 bulkdata 进行检查",
+    "upload-file.title_upload_series": "上传 bulkdata 进行系列",
     "upload-files.gif_with_multi_frames_in_it": "包含多帧的GIF",
     "upload-files.imported_": "已导入 ",
     "upload-files.no_web_application_with_the_web_service_class_stow_rs_found_in_this_device": "No Web Application with the Web Service Class \"STOW_RS\" found in this device",

src/main/webapp/assets/schema/archiveDevice.schema.json

@@ -34,6 +34,9 @@
     "dcmSpanningCFindSCPPolicy",
     "dcmFallbackCMoveSCPRetries",
     "dcmFallbackWadoURIHttpStatusCode",
+    "dcmFallbackWadoURIRedirectOnNotFound",
+    "dcmExternalWadoRSHttpStatusCode",
+    "dcmExternalWadoRSRedirectOnNotFound",
     "dcmTaskFetchSize",
     "dcmUPSProcessingFetchSize",
     "dcmRetrieveTaskWarningOnNoMatch",
@@ -635,12 +638,12 @@
     },
     "dcmFallbackWadoURIWebAppName": {
       "title": "Fallback WADO-URI Web Application Name",
-      "description": "Name of external Web Application to redirect WADO URI requests if the requested Object is not available by this archive. May be overwritten by configured values for particular Archive Network AEs.",
+      "description": "Name of external Web Application to redirect WADO-URI requests if the requested Object is not available by this archive. May be overwritten by configured values for particular Archive Network AEs.",
       "type": "string",
       "format": "webApp"
     },
     "dcmFallbackWadoURIHttpStatusCode": {
-      "title": "Fallback Wado URI Http Status Code",
+      "title": "Fallback WADO-URI Http Status Code",
       "description": "HTTP Status code of Redirect Response configured by Fallback WADO-URI Web Application Name. May be overwritten by configured values for particular Archive Network AEs.",
       "type": "integer",
       "default": 303,
@@ -651,6 +654,36 @@
         307
        ]
     },
+    "dcmFallbackWadoURIRedirectOnNotFound": {
+      "title": "Fallback WADO-URI Redirect On Not Found",
+      "description": "Indicates if WADO-URI requests are redirected to configured Fallback WADO-URI Web Application Name even if the object was not found or - if set to false - only if the object is no longer accessible on this archive. May be overwritten by configured values for particular Archive Network AEs.",
+      "type": "boolean",
+      "default": false
+    },
+    "dcmExternalWadoRSWebAppName": {
+      "title": "External WADO-RS Web Application Name",
+      "description": "Name of external Web Application to redirect WADO-RS requests if some of the requested objects are no longer accessible on this archive. May be overwritten by configured values for particular Archive Network AEs.",
+      "type": "string",
+      "format": "webApp"
+    },
+    "dcmExternalWadoRSHttpStatusCode": {
+      "title": "External WADO-RS Http Status Code",
+      "description": "HTTP Status code of Redirect Response configured by External WADO-RS Web Application Name. May be overwritten by configured values for particular Archive Network AEs.",
+      "type": "integer",
+      "default": 303,
+      "enum": [
+        301,
+        302,
+        303,
+        307
+       ]
+    },
+    "dcmExternalWadoRSRedirectOnNotFound": {
+      "title": "External WADO-RS Redirect On Not Found",
+      "description": "Indicates if WADO-RS requests are redirected to configured External WADO-RS Web Application Name even if the requested objects were not found or - if set to false - only if some of the requested objects are no longer accessible on this archive. May be overwritten by configured values for particular Archive Network AEs.",
+      "type": "boolean",
+      "default": false
+    },
     "dcmFallbackCMoveSCPCallingAET": {
       "title": "Fallback C-Move SCP Calling AE title",
       "description": "Calling AE Title used in A-ASSOCIATE-RQ to configured Fallback C-MOVE SCP. If absent, the AE Title of the external C-MOVE SCU is used. May be overwritten by configured value for particular Archive Network AEs.",

src/main/webapp/assets/schema/archiveNetworkAE.schema.json

@@ -367,22 +367,48 @@
     },
     "dcmFallbackWadoURIWebAppName": {
       "title": "Fallback WADO-URI Web Application Name",
-      "description": "Name of external Web Application to redirect WADO URI requests if the requested Object is not available by this archive. Overwrites value specified on Device level.",
+      "description": "Name of external Web Application to redirect WADO-URI requests if the requested Object is not available by this archive. Overwrites value specified on Device level.",
       "type": "string",
       "format": "webApp"
     },
     "dcmFallbackWadoURIHttpStatusCode": {
       "title": "Fallback WADO-URI HTTP Status Code",
       "description": "HTTP Status code of Redirect Response configured by Fallback WADO-URI Web Application Name. Overwrites value specified on Device level.",
       "type": "integer",
-      "default": 303,
       "enum": [
         301,
         302,
         303,
         307
       ]
     },
+    "dcmFallbackWadoURIRedirectOnNotFound": {
+      "title": "Fallback WADO-URI Redirect On Not Found",
+      "description": "Indicates if WADO-URI requests are redirected to configured Fallback WADO-URI Web Application Name even if the object was not found or - if set to false - only if the object is no longer accessible on this archive. Overwrites value specified on Device level.",
+      "type": "boolean"
+    },
+    "dcmExternalWadoRSWebAppName": {
+      "title": "External WADO-RS Web Application Name",
+      "description": "Name of external Web Application to redirect WADO-RS requests if the requested Object is not available by this archive. Overwrites value specified on Device level.",
+      "type": "string",
+      "format": "webApp"
+    },
+    "dcmExternalWadoRSHttpStatusCode": {
+      "title": "External WADO-RS HTTP Status Code",
+      "description": "HTTP Status code of Redirect Response configured by External WADO-RS Web Application Name. Overwrites value specified on Device level.",
+      "type": "integer",
+      "enum": [
+        301,
+        302,
+        303,
+        307
+      ]
+    },
+    "dcmExternalWadoRSRedirectOnNotFound": {
+      "title": "External WADO-RS Redirect On Not Found",
+      "description": "Indicates if WADO-RS requests are redirected to configured External WADO-RS Web Application Name even if the requested objects were not found or - if set to false - only if some of the requested objects are no longer accessible on this archive. Overwrites value specified on Device level.",
+      "type": "boolean"
+    },
     "dcmFallbackCMoveSCPCallingAET": {
       "title": "Fallback C-Move SCP Calling AE title",
       "description": "Calling AE Title used in A-ASSOCIATE-RQ to configured Fallback C-MOVE SCP. If absent, the AE Title of the external C-MOVE SCU is used. Overwrites value specified on Device level.",

src/main/webapp/assets/schema/de/archiveDevice.schema.json

@@ -34,6 +34,9 @@
     "dcmSpanningCFindSCPPolicy",
     "dcmFallbackCMoveSCPRetries",
     "dcmFallbackWadoURIHttpStatusCode",
+    "dcmFallbackWadoURIRedirectOnNotFound",
+    "dcmExternalWadoRSHttpStatusCode",
+    "dcmExternalWadoRSRedirectOnNotFound",
     "dcmTaskFetchSize",
     "dcmUPSProcessingFetchSize",
     "dcmRetrieveTaskWarningOnNoMatch",
@@ -651,6 +654,36 @@
         307
        ]
     },
+    "dcmFallbackWadoURIRedirectOnNotFound": {
+      "title": "Fallback WADO-URI Redirect On Not Found",
+      "description": "Indicates if WADO-URI requests are redirected to configured Fallback WADO-URI Web Application Name even if the object was not found or - if set to false - only if the object is no longer accessible on this archive. May be overwritten by configured values for particular Archive Network AEs.",
+      "type": "boolean",
+      "default": false
+    },
+    "dcmExternalWadoRSWebAppName": {
+      "title": "External WADO-RS Web Application Name",
+      "description": "Name of external Web Application to redirect WADO RS requests if some of the requested objects are no longer accessible on this archive. May be overwritten by configured values for particular Archive Network AEs.",
+      "type": "string",
+      "format": "webApp"
+    },
+    "dcmExternalWadoRSHttpStatusCode": {
+      "title": "External WADO-RS Http Status Code",
+      "description": "HTTP Status code of Redirect Response configured by External WADO-RS Web Application Name. May be overwritten by configured values for particular Archive Network AEs.",
+      "type": "integer",
+      "default": 303,
+      "enum": [
+        301,
+        302,
+        303,
+        307
+       ]
+    },
+    "dcmExternalWadoRSRedirectOnNotFound": {
+      "title": "External WADO-RS Redirect On Not Found",
+      "description": "Indicates if WADO-RS requests are redirected to configured External WADO-RS Web Application Name even if the requested objects were not found or - if set to false - only if some of the requested objects are no longer accessible on this archive. May be overwritten by configured values for particular Archive Network AEs.",
+      "type": "boolean",
+      "default": false
+    },
     "dcmFallbackCMoveSCPCallingAET": {
       "title": "Fallback C-Move SCP Calling AE title",
       "description": "Calling AE Title used in A-ASSOCIATE-RQ to configured Fallback C-MOVE SCP. If absent, the AE Title of the external C-MOVE SCU is used. May be overwritten by configured value for particular Archive Network AEs.",
@@ -1933,7 +1966,7 @@
     },
     "dcmTrustedIssuerOfPatientIDPattern": {
       "title": "Trusted Issuer of Patient ID Pattern",
-      "description": "Regular Expression identifying trusted Assigning Authority of Patient IDs in received DICOM objects and HL7 messages. If both, this field and 'Trusted Issuer of Patient ID' are configured, Patient IDs not qualified by trusted Assigning Authority matching the specified pattern, will be checked against one of the specified Assigning Authorities in 'Trusted Issuer of Patient ID' field. If Patient IDs are not qualified by either of these fields, they won't be used for identifying the Patient. If neither this field nor 'Trusted Issuer of Patient ID' is configured, all Patient IDs in received DICOM Objects and HL7 messages will be used for identifying the Patient.",
+      "description": "Regular Expression identifying trusted Assigning Authority of Patient IDs in received DICOM objects and HL7 messages. If both, this field and 'Trusted Issuer of Patient ID' are configured, Patient IDs not qualified by trusted Assigning Authority matching the specified pattern, will be checked against one of the specified Assigning Authorities in 'Trusted Issuer of Patient ID' field. If Patient IDs are not qualified by either of these fields, they won't be used for identifying the Patient. If neither this field nor 'Trusted Issuer of Patient ID' is configured, all Patient IDs in received DICOM Objects and HL7 messages will be used for identifying the Patient.archiveDevice.dcmTrustedIssuerOfPatientID:Trusted Issuer of Patient ID|Trusted Assigning Authority of Patient IDs in received DICOM objects and HL7 messages. If both, this field and 'Trusted Issuer of Patient ID Pattern' are configured, Patient IDs not qualified by trusted Assigning Authority matching the pattern specified in 'Trusted Issuer of Patient ID Pattern', will be checked against one of the specified Assigning Authorities in this field. If Patient IDs are not qualified by either of these fields, they won't be used for identifying the Patient. If neither this field nor 'Trusted Issuer of Patient ID Pattern' is configured, all Patient IDs in received DICOM Objects and HL7 messages will be used for identifying the Patient. Format: {Issuer of Patient ID}[&{UniversalEntityID}&{UniversalEntityIDType}].",
       "type": "string"
     },
     "dcmTrustedIssuerOfPatientID": {

src/main/webapp/assets/schema/de/archiveHL7Application.schema.json

@@ -136,7 +136,7 @@
     },
     "hl7PrimaryAssigningAuthorityOfPatientID": {
       "title": "HL7 Primary Assigning Authority of Patient ID",
-      "description": "Assigning Authority of Patient ID in received HL7 message used to search primary qualified patient identifier in the list of identifiers in PID-3 / MRG.1. This qualified patient identifier shall be used on the root dataset. If absent, by default the first patient identifier pair in PID-3 / MRG.1 shall be used as primary patient identifier on root dataset. If none of the qualified patient identifiers in the list match with the configured issuer, archive server log shall contain a log INFO message and by default the first qualified patient identifier in PID-3 / MRG.1 shall be used. Format: {Issuer of Patient ID}[&{UniversalEntityID}&{UniversalEntityIDType}]. Overwrites value specified on Device level.",
+      "description": "Assigning Authority of Patient ID in received HL7 message used to search primary qualified patient identifier in the list of identifiers in PID-3 / MRG.1. This qualified patient identifier shall be used on the root dataset. If absent, by default the first patient identifier pair in PID-3 / MRG.1 shall be used as primary patient identifier on root dataset. If none of the qualified patient identifiers in the list match with the configured issuer, archive server log shall contain a log INFO message and by default the first qualified patient identifier in PID-3 / MRG.1 shall be used. Format: {Issuer of Patient ID}[&{UniversalEntityID}&{UniversalEntityIDType}]. Overwrites values specified on Device level.",
       "type": "string"
     },
     "hl7OtherPatientIDs": {