UI Configuration -> UI Elasticsearch URL configuration : Misleading '…

…Elasticsearch WebApp' field description #41, UI Configuration -> UI Cluster Configuration : Improve misleading duplicate 'Web Application' field names #40
dcm4che · Jan 13, 2021 · dff3953 · dff3953
1 parent 095204f
commit dff3953
Show file tree

Hide file tree

Showing 18 changed files with 88 additions and 66 deletions.
diff --git a/src/main/webapp/assets/schema/hi/uiCompareSide.schema.json b/src/main/webapp/assets/schema/hi/uiCompareSide.schema.json
@@ -21,8 +21,8 @@
       "type": "string"
     },
     "dcmuiCompareSideOrder": {
-      "title": "क्रम",
-      "description": "पक्षों की तुलना का क्रम ।",
+      "title": "Order",
+      "description": "Order of the Compare side",
       "type": "integer",
       "default":0,
       "enum":[

diff --git a/src/main/webapp/assets/schema/hi/uiDashboard.schema.json b/src/main/webapp/assets/schema/hi/uiDashboard.schema.json
@@ -3,7 +3,8 @@
   "description": "UI डैशबोर्ड विन्यास ।",
   "type": "object",
   "required": [
-    "dcmuiDashboardConfigName"
+    "dcmuiDashboardConfigName",
+    "dcmuiCountWebApp"
   ],
   "properties": {
     "dcmuiDashboardConfigName": {
@@ -44,9 +45,9 @@
       "type": "array",
       "items" : { "type": "string" }
     },
-    "dcmuiCountAET": {
-      "title": "गिनती वेब अनुप्रयोग",
-      "description": "डैशबोर्ड में स्टडीज की गिनती प्राप्त करने के लिए चुने हुए वेब अनुप्रयोग का इस्तमाल होगा ।",
+    "dcmuiCountWebApp": {
+      "title": "गिनती Web App",
+      "description": "डैशबोर्ड में स्टडीज की गिनती प्राप्त करने के लिए चुने हुए Web App का इस्तमाल होगा ।",
       "type": "string",
       "format": "webApp"
     },

diff --git a/src/main/webapp/assets/schema/hi/uiDeviceCluster.schema.json b/src/main/webapp/assets/schema/hi/uiDeviceCluster.schema.json
@@ -19,11 +19,17 @@
       "type": "string"
     },
     "dcmuiDeviceClusterDevices": {
-      "title": "डिवाइस",
-      "description": "कॉन्फ़िगर किए हुए डिवाइसेस के नामों को जोड़े ।",
+      "title": "Web Application for Devices",
+      "description": "Select configured WebApps to used to access the corresponding devices",
       "type": "array",
       "items" : { "type": "string" },
-      "format": "dcmuiDeviceURLObject"
+      "format": "webApp"
+    },
+    "dcmuiClusterWebApp": {
+      "title": "Web Application",
+      "description": "Web Application with the class QIDO-RS",
+      "type":  "string",
+      "format": "webApp"
     },
     "dcmuiClusterWebApp": {
       "title": "वेब अनुप्रयोग",

diff --git a/src/main/webapp/assets/schema/hi/uiElasticsearchURL.schema.json b/src/main/webapp/assets/schema/hi/uiElasticsearchURL.schema.json
@@ -16,7 +16,7 @@
     },
     "dcmuiElasticsearchWebApp": {
       "title": "Elasticsearch WebApp",
-      "description": "Access URL of Elastic Search. E.g. http(s)://<elasticsearch-host>:<elasticsearch-port>",
+      "description": "Web Application that will be used te extract the Elasticsearch URL and access Elasticsearch",
       "type": "string",
       "format": "webApp"
     },

diff --git a/src/main/webapp/assets/schema/it/uiCompareSide.schema.json b/src/main/webapp/assets/schema/it/uiCompareSide.schema.json
@@ -6,7 +6,8 @@
     "dcmuiCompareSideName",
     "dcmuiCompareSideCluster",
     "dcmuiCompareSideElasticsearch",
-    "dcmuiCompareSideInstalled"
+    "dcmuiCompareSideInstalled",
+    "dcmuiCompareSideOrder"
   ],
   "properties": {
     "dcmuiCompareSideName": {
@@ -19,6 +20,16 @@
       "description": "Una breve descrizione di questo Gruppo",
       "type": "string"
     },
+    "dcmuiCompareSideOrder": {
+      "title": "Order",
+      "description": "Order of the Compare side",
+      "type": "integer",
+      "default":0,
+      "enum":[
+        0,
+        1
+      ]
+    },
     "dcmuiCompareSideCluster": {
       "title": "Cluster",
       "description": "Seleziona un cluster",

diff --git a/src/main/webapp/assets/schema/it/uiDashboard.schema.json b/src/main/webapp/assets/schema/it/uiDashboard.schema.json
@@ -3,7 +3,8 @@
   "description": "Configurazione dashboard dell'interfaccia utente",
   "type": "object",
   "required": [
-    "dcmuiDashboardConfigName"
+    "dcmuiDashboardConfigName",
+    "dcmuiCountWebApp"
   ],
   "properties": {
     "dcmuiDashboardConfigName": {
@@ -44,11 +45,11 @@
       "type": "array",
       "items" : { "type": "string" }
     },
-    "dcmuiCountAET": {
-      "title": "Conteggio Aet",
-      "description": "L'Aet selezionato verrà utilizzato per ottenere il conteggio degli studi nella dashboard",
+    "dcmuiCountWebApp": {
+      "title": "Conteggio Web APp",
+      "description": "L'Web App selezionato verrà utilizzato per ottenere il conteggio degli studi nella dashboard",
       "type": "string",
-      "format": "dcmArchiveAETitle"
+      "format": "webApp"
     },
     "dcmuiCompareSideObjects": {
       "title": "Confronta i lati",

diff --git a/src/main/webapp/assets/schema/it/uiDeviceCluster.schema.json b/src/main/webapp/assets/schema/it/uiDeviceCluster.schema.json
@@ -18,24 +18,18 @@
       "description": "Descrizione del cluster",
       "type": "string"
     },
-    "dcmuiDeviceClusterLoadBalancer": {
-      "title": "Bilanciamento del Carico",
-      "description": "Seleziona il Load Balancer",
-      "type": "string",
-      "format": "dcmuiDeviceURLObject"
-    },
-    "dcmuiDeviceClusterKeycloakServer": {
-      "title": "Server Keycloak ",
-      "description": "Se questo cluster non utilizza lo stesso Keycloak, selezionare il Keycloak configurato",
-      "type":  "string",
-      "format": "dcmKeycloakServer"
-    },
     "dcmuiDeviceClusterDevices": {
-      "title": "Dispositivo",
-      "description": "Aggiungi il nome dei dispositivi configurati",
+      "title": "Web Application for Devices",
+      "description": "Select configured WebApps to used to access the corresponding devices",
       "type": "array",
       "items" : { "type": "string" },
-      "format": "dcmuiDeviceURLObject"
+      "format": "webApp"
+    },
+    "dcmuiClusterWebApp": {
+      "title": "Web Application",
+      "description": "Web Application with the class QIDO-RS",
+      "type":  "string",
+      "format": "webApp"
     },
     "dcmuiDeviceClusterInstalled": {
       "title": "Installato",

diff --git a/src/main/webapp/assets/schema/it/uiElasticsearchURL.schema.json b/src/main/webapp/assets/schema/it/uiElasticsearchURL.schema.json
@@ -14,17 +14,13 @@
       "description": "URL dell'interfaccia utente di Elasticsearch",
       "type": "string"
     },
-    "dcmuiElasticsearchURL": {
-      "title": "URL dell'interfaccia utente di Elasticsearch",
-      "description": "URL di accesso di Elasticsearch. Ad esempio: http(s)://<elasticsearch-host>:<elasticsearch-port> ",
-      "type": "string"
+    "dcmuiElasticsearchWebApp": {
+      "title": "Elasticsearch WebApp",
+      "description": "Web Application that will be used te extract the Elasticsearch URL and access Elasticsearch",
+      "type": "string",
+      "format": "webApp"
     },
-    "dcmuiElasticsearchURLKeycloakServer": {
-      "title": "Server Keycloak ",
-      "description": "Seleziona Keycloak Server da cui ottenere il token portatore per accedere a Elasticsearch",
-      "type":  "string",
-      "format": "dcmKeycloakServer"
-    },"dcmuiAuditEnterpriseSiteID": {
+    "dcmuiAuditEnterpriseSiteID": {
       "title": "Audit Enterprise SiteID",
       "description": "Set Audit Enterprise SiteID which should be used on Elasticsearch queries",
       "type": "string"

diff --git a/src/main/webapp/assets/schema/ja/uiCompareSide.schema.json b/src/main/webapp/assets/schema/ja/uiCompareSide.schema.json
@@ -21,8 +21,8 @@
       "type": "string"
     },
     "dcmuiCompareSideOrder": {
-      "title": "順序",
-      "description": "比較側の 順序",
+      "title": "Order",
+      "description": "Order of the Compare side",
       "type": "integer",
       "default":0,
       "enum":[

diff --git a/src/main/webapp/assets/schema/ja/uiDashboard.schema.json b/src/main/webapp/assets/schema/ja/uiDashboard.schema.json
@@ -3,8 +3,8 @@
   "description": "UI ダッシュボード 構成",
   "type": "object",
   "required": [
-    "dcmuiDashboardConfigName"
-  ],
+    "dcmuiDashboardConfigName",
+    "dcmuiCountWebApp"  ],
   "properties": {
     "dcmuiDashboardConfigName": {
       "title": "UI ダッシュボード 構成名",
@@ -44,9 +44,9 @@
       "type": "array",
       "items" : { "type": "string" }
     },
-    "dcmuiCountAET": {
-      "title": "カウント ウェブ アプリケーション",
-      "description": "選択された ウェブ アプリケーションは、ダッシュボードに 検査の カウントを 取得する ために 使用されます。",
+    "dcmuiCountWebApp": {
+      "title": "カウント Web App",
+      "description": "選択された Web Appは、ダッシュボードに 検査の カウントを 取得する ために 使用されます。",
       "type": "string",
       "format": "webApp"
     },

diff --git a/src/main/webapp/assets/schema/ja/uiDeviceCluster.schema.json b/src/main/webapp/assets/schema/ja/uiDeviceCluster.schema.json
@@ -19,11 +19,17 @@
       "type": "string"
     },
     "dcmuiDeviceClusterDevices": {
-      "title": "デバイス",
-      "description": "構成済み デバイスの 名前を 追加します。",
+      "title": "Web Application for Devices",
+      "description": "Select configured WebApps to used to access the corresponding devices",
       "type": "array",
       "items" : { "type": "string" },
-      "format": "dcmuiDeviceURLObject"
+      "format": "webApp"
+    },
+    "dcmuiClusterWebApp": {
+      "title": "Web Application",
+      "description": "Web Application with the class QIDO-RS",
+      "type":  "string",
+      "format": "webApp"
     },
     "dcmuiClusterWebApp": {
       "title": "ウェブ アプリケーション",

diff --git a/src/main/webapp/assets/schema/ja/uiElasticsearchURL.schema.json b/src/main/webapp/assets/schema/ja/uiElasticsearchURL.schema.json
@@ -16,7 +16,7 @@
     },
     "dcmuiElasticsearchWebApp": {
       "title": "Elasticsearch WebApp",
-      "description": "Access URL of Elastic Search. E.g. http(s)://<elasticsearch-host>:<elasticsearch-port>",
+      "description": "Web Application that will be used te extract the Elasticsearch URL and access Elasticsearch",
       "type": "string",
       "format": "webApp"
     },

diff --git a/src/main/webapp/assets/schema/mr/uiCompareSide.schema.json b/src/main/webapp/assets/schema/mr/uiCompareSide.schema.json
@@ -21,8 +21,8 @@
       "type": "string"
     },
     "dcmuiCompareSideOrder": {
-      "title": "क्रम",
-      "description": "बाजूंची तुलनाचे क्रम.",
+      "title": "Order",
+      "description": "Order of the Compare side",
       "type": "integer",
       "default":0,
       "enum":[

diff --git a/src/main/webapp/assets/schema/mr/uiDashboard.schema.json b/src/main/webapp/assets/schema/mr/uiDashboard.schema.json
@@ -3,7 +3,8 @@
   "description": "UI Dashboard Configuration",
   "type": "object",
   "required": [
-    "dcmuiDashboardConfigName"
+    "dcmuiDashboardConfigName",
+    "dcmuiCountWebApp"
   ],
   "properties": {
     "dcmuiDashboardConfigName": {
@@ -44,9 +45,9 @@
       "type": "array",
       "items" : { "type": "string" }
     },
-    "dcmuiCountAET": {
-      "title": "गणना वेब अनुप्रयोग",
-      "description": "डॅशबोर्डमध्ये अभ्यासाची गणना मिळविण्यासाठी निवडलेले वेब अनुप्रयोग वापरले जाईल.",
+    "dcmuiCountWebApp": {
+      "title": "Count Web App",
+      "description": "Selected Web App, It will be used to get the count of studies in the dashboard",
       "type": "string",
       "format": "webApp"
     },

diff --git a/src/main/webapp/assets/schema/mr/uiDeviceCluster.schema.json b/src/main/webapp/assets/schema/mr/uiDeviceCluster.schema.json
@@ -19,11 +19,17 @@
       "type": "string"
     },
     "dcmuiDeviceClusterDevices": {
-      "title": "डिव्हाइस",
-      "description": "कॉन्फिगर केलेल्या डिव्हाइसेसचे नाव जोडा.",
+      "title": "Web Application for Devices",
+      "description": "Select configured WebApps to used to access the corresponding devices",
       "type": "array",
       "items" : { "type": "string" },
-      "format": "dcmuiDeviceURLObject"
+      "format": "webApp"
+    },
+    "dcmuiClusterWebApp": {
+      "title": "Web Application",
+      "description": "Web Application with the class QIDO-RS",
+      "type":  "string",
+      "format": "webApp"
     },
     "dcmuiClusterWebApp": {
       "title": "वेब अनुप्रयोग",

diff --git a/src/main/webapp/assets/schema/mr/uiElasticsearchURL.schema.json b/src/main/webapp/assets/schema/mr/uiElasticsearchURL.schema.json
@@ -16,11 +16,11 @@
     },
     "dcmuiElasticsearchWebApp": {
       "title": "Elasticsearch WebApp",
-      "description": "Access URL of Elastic Search. E.g. http(s)://<elasticsearch-host>:<elasticsearch-port>",
+      "description": "Web Application that will be used te extract the Elasticsearch URL and access Elasticsearch",
       "type": "string",
       "format": "webApp"
-    },
-    "dcmuiAuditEnterpriseSiteID": {
+    }
+    ,"dcmuiAuditEnterpriseSiteID": {
       "title": "Audit Enterprise SiteID",
       "description": "Set Audit Enterprise SiteID which should be used on Elasticsearch queries",
       "type": "string"

diff --git a/src/main/webapp/assets/schema/uiDeviceCluster.schema.json b/src/main/webapp/assets/schema/uiDeviceCluster.schema.json
@@ -19,7 +19,7 @@
       "type": "string"
     },
     "dcmuiDeviceClusterDevices": {
-      "title": "Web Application",
+      "title": "Web Application for Devices",
       "description": "Select configured WebApps to used to access the corresponding devices",
       "type": "array",
       "items" : { "type": "string" },

diff --git a/src/main/webapp/assets/schema/uiElasticsearchURL.schema.json b/src/main/webapp/assets/schema/uiElasticsearchURL.schema.json
@@ -16,7 +16,7 @@
     },
     "dcmuiElasticsearchWebApp": {
       "title": "Elasticsearch WebApp",
-      "description": "Access URL of Elastic Search. E.g. http(s)://<elasticsearch-host>:<elasticsearch-port>",
+      "description": "Web Application that will be used te extract the Elasticsearch URL and access Elasticsearch",
       "type": "string",
       "format": "webApp"
     },