From 73306f3655d4ea3713afda3a62600709822cbb38 Mon Sep 17 00:00:00 2001
From: Mike McKay <mfmckay@wustl.edu>
Date: Wed, 1 Jun 2016 07:51:16 -0500
Subject: [PATCH] Updated Dicom Scp Upload section to pull information now
saved in AdminUI.
---
.../turbine/modules/screens/DICOMSCPPage.java | 12 +++++++-----
.../turbine/modules/screens/UploadOptions.java | 18 ++++++------------
.../xnat-templates/screens/DICOMSCPPage.vm | 13 ++++++++-----
.../xnat-templates/screens/UploadOptions.vm | 13 ++++++++-----
4 files changed, 29 insertions(+), 27 deletions(-)
diff --git a/src/main/java/org/nrg/xnat/turbine/modules/screens/DICOMSCPPage.java b/src/main/java/org/nrg/xnat/turbine/modules/screens/DICOMSCPPage.java
index 29b4036e..c7a24335 100644
--- a/src/main/java/org/nrg/xnat/turbine/modules/screens/DICOMSCPPage.java
+++ b/src/main/java/org/nrg/xnat/turbine/modules/screens/DICOMSCPPage.java
@@ -12,12 +12,14 @@ package org.nrg.xnat.turbine.modules.screens;
import org.apache.turbine.util.RunData;
import org.apache.velocity.context.Context;
-import org.nrg.xdat.om.ArcArchivespecification;
+import org.nrg.dcm.DicomSCPManager;
+import org.nrg.dcm.preferences.DicomSCPInstance;
+import org.nrg.xdat.XDAT;
import org.nrg.xdat.turbine.modules.screens.SecureScreen;
-import org.nrg.xnat.turbine.utils.ArcSpecManager;
import java.text.SimpleDateFormat;
import java.util.Calendar;
+import java.util.List;
public class DICOMSCPPage extends SecureScreen {
@@ -25,8 +27,8 @@ public class DICOMSCPPage extends SecureScreen {
protected void doBuildTemplate(RunData data, Context context) throws Exception {
final SimpleDateFormat formatter = new SimpleDateFormat("yyyyMMdd_hhmmss");
context.put("uploadID", formatter.format(Calendar.getInstance().getTime()));
- final ArcArchivespecification arc = ArcSpecManager.GetInstance();
- context.put("arc", arc);
+ List<DicomSCPInstance> scps = XDAT.getContextService().getBean(DicomSCPManager.class).getDicomSCPInstances();
+ context.put("host", XDAT.getSiteConfigPreferences().getSiteUrl());
+ context.put("scps", scps);
}
-
}
diff --git a/src/main/java/org/nrg/xnat/turbine/modules/screens/UploadOptions.java b/src/main/java/org/nrg/xnat/turbine/modules/screens/UploadOptions.java
index bf9f2a75..ea0ba6c5 100644
--- a/src/main/java/org/nrg/xnat/turbine/modules/screens/UploadOptions.java
+++ b/src/main/java/org/nrg/xnat/turbine/modules/screens/UploadOptions.java
@@ -12,17 +12,10 @@ package org.nrg.xnat.turbine.modules.screens;
import org.apache.turbine.util.RunData;
import org.apache.velocity.context.Context;
-import org.nrg.xdat.om.ArcArchivespecification;
+import org.nrg.dcm.DicomSCPManager;
+import org.nrg.dcm.preferences.DicomSCPInstance;
+import org.nrg.xdat.XDAT;
import org.nrg.xdat.turbine.modules.screens.SecureScreen;
-import org.nrg.xnat.turbine.utils.ArcSpecManager;
-import org.nrg.xnat.utils.AppletConfig;
-import org.nrg.xnat.utils.XnatHttpUtils;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.nrg.framework.utilities.Reflection;
-import org.nrg.xdat.om.XnatPvisitdata;
-import org.nrg.xdat.turbine.utils.TurbineUtils;
import java.text.SimpleDateFormat;
import java.util.Calendar;
@@ -34,8 +27,9 @@ public class UploadOptions extends SecureScreen {
protected void doBuildTemplate(RunData data, Context context) throws Exception {
final SimpleDateFormat formatter = new SimpleDateFormat("yyyyMMdd_hhmmss");
context.put("uploadID", formatter.format(Calendar.getInstance().getTime()));
- final ArcArchivespecification arc = ArcSpecManager.GetInstance();
- context.put("arc", arc);
+ List<DicomSCPInstance> scps = XDAT.getContextService().getBean(DicomSCPManager.class).getDicomSCPInstances();
+ context.put("host", XDAT.getSiteConfigPreferences().getSiteUrl());
+ context.put("scps", scps);
}
}
diff --git a/src/main/webapp/xnat-templates/screens/DICOMSCPPage.vm b/src/main/webapp/xnat-templates/screens/DICOMSCPPage.vm
index e40241f0..56343c49 100644
--- a/src/main/webapp/xnat-templates/screens/DICOMSCPPage.vm
+++ b/src/main/webapp/xnat-templates/screens/DICOMSCPPage.vm
@@ -14,11 +14,14 @@
<tr id="option4">
<td>
<br><b>DICOM C-STORE receiver (SCP) Specifications</b>
- <ul>
- <li>Host Name: $!arc.getDcm_dcmHost()</li>
- <li>Port: $!arc.getDcm_dcmPort()</li>
- <li>AE Title(s): $!arc.getDcm_dcmAe()</li>
- </ul>
+ #foreach ($scp in $scps)
+ <ul>
+ <li>ID: $!scp.getScpId()</li>
+ <li>AE Title: $!scp.getAeTitle()</li>
+ <li>Port: $!scp.getPort()</li>
+ </ul>
+ <br>
+ #end
</td>
</tr>
</table>
\ No newline at end of file
diff --git a/src/main/webapp/xnat-templates/screens/UploadOptions.vm b/src/main/webapp/xnat-templates/screens/UploadOptions.vm
index bc03e4ea..c87ec86a 100644
--- a/src/main/webapp/xnat-templates/screens/UploadOptions.vm
+++ b/src/main/webapp/xnat-templates/screens/UploadOptions.vm
@@ -567,11 +567,14 @@
<tr id="option4">
<td>
<br><b>DICOM C-STORE receiver (SCP) Specifications</b>
- <ul>
- <li>Host Name: $!arc.getDcm_dcmHost()</li>
- <li>Port: $!arc.getDcm_dcmPort()</li>
- <li>AE Title(s): $!arc.getDcm_dcmAe()</li>
- </ul>
+ #foreach ($scp in $scps)
+ <ul>
+ <li>ID: $!scp.getScpId()</li>
+ <li>AE Title: $!scp.getAeTitle()</li>
+ <li>Port: $!scp.getPort()</li>
+ </ul>
+ <br>
+ #end
</td>
</tr>
<tr>
--
GitLab