Menu
▾
▴
[dcm4che-commits] SF.net SVN: dcm4che:[15680] dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/ src
|
From: <rob...@us...> - 2011-07-13 08:14:00
|
Revision: 15680
http://dcm4che.svn.sourceforge.net/dcm4che/?rev=15680&view=rev
Author: robertdavid
Date: 2011-07-13 08:13:53 +0000 (Wed, 13 Jul 2011)
Log Message:
-----------
[#WEB-412] Provide teaching-file search page based on matching of content-item sequence
Modified Paths:
--------------
dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/java/org/dcm4chee/web/war/folder/ExportPage.java
dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/java/org/dcm4chee/web/war/folder/FilePanel.java
dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/java/org/dcm4chee/web/war/tc/TCMultiLineLabel.java
dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/resources/org/dcm4chee/web/war/folder/ExportPage.html
dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/resources/org/dcm4chee/web/war/folder/ExportPage.properties
dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/resources/org/dcm4chee/web/war/folder/ExportPage_de.properties
dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/webapp/WEB-INF/web.xml
dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/test/resources/org/dcm4chee/web/war/WEB-INF/dcm4chee.hive
dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/test/resources/roles-test.json
Modified: dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/java/org/dcm4chee/web/war/folder/ExportPage.java
===================================================================
--- dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/java/org/dcm4chee/web/war/folder/ExportPage.java 2011-07-12 13:37:33 UTC (rev 15679)
+++ dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/java/org/dcm4chee/web/war/folder/ExportPage.java 2011-07-13 08:13:53 UTC (rev 15680)
@@ -43,7 +43,9 @@
import java.util.ArrayList;
import java.util.Date;
import java.util.HashMap;
+import java.util.HashSet;
import java.util.List;
+import java.util.Set;
import org.apache.wicket.MetaDataKey;
import org.apache.wicket.ResourceReference;
@@ -243,7 +245,7 @@
}
}.setOutputMarkupId(true));
- form.add( new AjaxButton("export", new ResourceModel("export.exportBtn.text")){
+ form.add(new AjaxButton("export", new ResourceModel("export.exportBtn.text")){
private static final long serialVersionUID = 1L;
@@ -322,6 +324,25 @@
}
});
add(JavascriptPackageResource.getHeaderContribution(ExportPage.class, "popupcloser.js"));
+
+ form.add(new AjaxButton("download", new ResourceModel("export.downloadBtn.text")) {
+
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ public boolean isEnabled() {
+ return exportInfo.hasSelection() && isExportInactive();
+ }
+
+ @Override
+ protected void onSubmit(AjaxRequestTarget target, Form<?> form) {
+ System.out.println("DOWNLOAD");
+// getSession().setMetaData(LAST_DESTINATION_AET_ATTRIBUTE, destinationAET);
+// exportSelected();
+ download();
+ }
+ }.setOutputMarkupId(true));
+
}
private void initDestinationAETs() {
@@ -366,6 +387,37 @@
}
}
+ // TODO:
+ private void download() {
+
+// StudyListLocal dao = (StudyListLocal)
+// JNDIUtils.lookup(StudyListLocal.JNDI_NAME);
+//
+// for (MoveRequest mr : exportInfo.requests) {
+// Set<String> instances = new HashSet<String>();
+//
+// for (String studyUID : mr.studyIUIDs)
+//
+// dao.
+// for (Study s : dao.findStudiesOfPatient(, false, StudyPermissionHelper.get().applyStudyPermissions() ?
+// StudyPermissionHelper.get().getDicomRoles() : null))
+// System.out.println(s);
+// }
+//
+//// List<Instance> findInstancesOfSeries(long pk);
+//
+//
+// System.out.println("EXPORTING: " + mr.toString());
+// System.out.println("Patient: " + mr.patId);
+// for (String s : mr.studyIUIDs)
+// System.out.println("Study: " + s.toString());
+// for (String se : mr.seriesIUIDs)
+// System.out.println("Series: " + se.toString());
+// for (String i : mr.sopIUIDs)
+// System.out.println("Study: " + i.toString());
+// }
+ }
+
private String[] toArray(List<String> l) {
if (l == null) return null;
return l.toArray(new String[l.size()]);
@@ -746,7 +798,6 @@
return ((ExportResponseHandler) o).id == id;
}
-
@Override
public void onDimseRSP(Association as, DicomObject cmd,
DicomObject data) {
Modified: dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/java/org/dcm4chee/web/war/folder/FilePanel.java
===================================================================
--- dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/java/org/dcm4chee/web/war/folder/FilePanel.java 2011-07-12 13:37:33 UTC (rev 15679)
+++ dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/java/org/dcm4chee/web/war/folder/FilePanel.java 2011-07-13 08:13:53 UTC (rev 15680)
@@ -88,5 +88,4 @@
add(new Label("file.fileSystem.status"));
add(new Label("file.fileSystem.userInfo"));
}
-
}
Modified: dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/java/org/dcm4chee/web/war/tc/TCMultiLineLabel.java
===================================================================
--- dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/java/org/dcm4chee/web/war/tc/TCMultiLineLabel.java 2011-07-12 13:37:33 UTC (rev 15679)
+++ dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/java/org/dcm4chee/web/war/tc/TCMultiLineLabel.java 2011-07-13 08:13:53 UTC (rev 15680)
@@ -37,7 +37,6 @@
* ***** END LICENSE BLOCK ***** */
package org.dcm4chee.web.war.tc;
-import org.apache.commons.lang.StringEscapeUtils;
import org.apache.wicket.markup.ComponentTag;
import org.apache.wicket.markup.MarkupStream;
import org.apache.wicket.markup.html.basic.MultiLineLabel;
@@ -48,6 +47,9 @@
* @since April 28, 2011
*/
public class TCMultiLineLabel extends MultiLineLabel {
+
+ private static final long serialVersionUID = 1L;
+
private int cutAtIndex = -1;
public TCMultiLineLabel(final String id, String text, int cutAtIndex) {
@@ -72,10 +74,6 @@
String s2 = s;
if (s2 != null) {
- s2 = unescapeHtml(s);
- }
-
- if (s2 != null) {
s2 = replaceNewlines(s2);
}
@@ -86,14 +84,6 @@
return s2;
}
- private String unescapeHtml(String s) {
- if (s != null) {
- return StringEscapeUtils.unescapeHtml(s);
- }
-
- return s;
- }
-
private String replaceNewlines(String s) {
if (s == null) {
return null;
Modified: dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/resources/org/dcm4chee/web/war/folder/ExportPage.html
===================================================================
--- dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/resources/org/dcm4chee/web/war/folder/ExportPage.html 2011-07-12 13:37:33 UTC (rev 15679)
+++ dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/resources/org/dcm4chee/web/war/folder/ExportPage.html 2011-07-13 08:13:53 UTC (rev 15680)
@@ -50,6 +50,9 @@
<input type="submit" wicket:id="close" />
<input type="checkbox" wicket:id="closeOnFinished" />
<span wicket:id="closeOnFinishedLabel">Close after export is finished</span>
+ <div style="margin-top: 30px;">
+ <input wicket:id="download" type="submit" />
+ </div>
</form>
</body>
</html>
\ No newline at end of file
Modified: dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/resources/org/dcm4chee/web/war/folder/ExportPage.properties
===================================================================
--- dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/resources/org/dcm4chee/web/war/folder/ExportPage.properties 2011-07-12 13:37:33 UTC (rev 15679)
+++ dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/resources/org/dcm4chee/web/war/folder/ExportPage.properties 2011-07-13 08:13:53 UTC (rev 15680)
@@ -14,4 +14,5 @@
export.exportBtn.text=Export
export.closeBtn.text=Close
-export.closeOnFinishedLabel=Close after export has finished successfully
\ No newline at end of file
+export.closeOnFinishedLabel=Close after export has finished successfully
+export.downloadBtn.text=Download
\ No newline at end of file
Modified: dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/resources/org/dcm4chee/web/war/folder/ExportPage_de.properties
===================================================================
--- dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/resources/org/dcm4chee/web/war/folder/ExportPage_de.properties 2011-07-12 13:37:33 UTC (rev 15679)
+++ dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/resources/org/dcm4chee/web/war/folder/ExportPage_de.properties 2011-07-13 08:13:53 UTC (rev 15680)
@@ -14,4 +14,5 @@
export.exportBtn.text=Export
export.closeBtn.text=Schlie\xDFen
-export.closeOnFinishedLabel=Fenster nach erfolgreichem Export schlie\xDFen
\ No newline at end of file
+export.closeOnFinishedLabel=Fenster nach erfolgreichem Export schlie\xDFen
+export.downloadBtn.text=Download
\ No newline at end of file
Modified: dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/webapp/WEB-INF/web.xml
===================================================================
--- dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/webapp/WEB-INF/web.xml 2011-07-12 13:37:33 UTC (rev 15679)
+++ dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/webapp/WEB-INF/web.xml 2011-07-13 08:13:53 UTC (rev 15680)
@@ -4,6 +4,17 @@
xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
version="2.4">
<display-name>dcm4chee-web</display-name>
+
+ <servlet>
+ <servlet-name>StudyDownload</servlet-name>
+ <servlet-class>org.dcm4chee.web.war.StudyDownload</servlet-class>
+ <load-on-startup>1</load-on-startup>
+ </servlet>
+ <servlet-mapping>
+ <servlet-name>StudyDownload</servlet-name>
+ <url-pattern>/s/*</url-pattern>
+ </servlet-mapping>
+
<filter>
<filter-name>wicket.dcm4chee-web</filter-name>
<filter-class>org.apache.wicket.protocol.http.WicketFilter</filter-class>
Modified: dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/test/resources/org/dcm4chee/web/war/WEB-INF/dcm4chee.hive
===================================================================
--- dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/test/resources/org/dcm4chee/web/war/WEB-INF/dcm4chee.hive 2011-07-12 13:37:33 UTC (rev 15679)
+++ dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/test/resources/org/dcm4chee/web/war/WEB-INF/dcm4chee.hive 2011-07-13 08:13:53 UTC (rev 15680)
@@ -82,6 +82,13 @@
permission ${ComponentPermission} "org.dcm4chee.web.war.MainPage:trash:deleteButton", "render, enable";
};
+grant principal org.apache.wicket.security.hive.authorization.SimplePrincipal "TCRead"
+{
+// KEY: swarm.principal.TCRead
+ permission ${ComponentPermission} "org.dcm4chee.web.war.tc.TCPanel", "render, enable";
+ permission ${ComponentPermission} "org.dcm4chee.web.war.MainPage:tc:webviewerInstanceLink", "render, enable";
+};
+
grant principal org.apache.wicket.security.hive.authorization.SimplePrincipal "AERead"
{
// KEY: swarm.principal.AERead
Modified: dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/test/resources/roles-test.json
===================================================================
--- dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/test/resources/roles-test.json 2011-07-12 13:37:33 UTC (rev 15679)
+++ dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/test/resources/roles-test.json 2011-07-13 08:13:53 UTC (rev 15680)
@@ -1,4 +1,4 @@
-{"AETGroups":[],"AETRole":false,"description":"","dicomRole":false,"roleGroups":[],"rolename":"WebAdmin","superuser":true,"swarmPrincipals":["FolderActions","Dashboard","FileSystem","AEWrite","MWLRead","UserRead","SystemInfo","UserManagement","FolderRead","MWLWrite","FolderWrite","RoleWrite","AERead","RoleRead","StudyPermissionsWrite","LoginAllowed","ReportWrite","Queue","ReportRead","UserWrite","TrashActions","TrashRead"],"universalMatch":true,"uuid":"ca4686c2-1140-498f-9287-1cbe8ab0145a","webRole":true}
-{"AETGroups":[],"AETRole":false,"description":"","dicomRole":false,"roleGroups":[],"rolename":"WebUser","superuser":false,"swarmPrincipals":["FolderActions","Dashboard","AEWrite","FileSystem","MWLRead","SystemInfo","FolderRead","MWLWrite","FolderWrite","AERead","LoginAllowed","StudyPermissionsWrite","Queue","ReportRead","TrashActions","TrashRead"],"universalMatch":false,"uuid":"a2d823d9-4f12-4f20-a380-93e43a6968ca","webRole":true}
-{"AETGroups":[],"AETRole":false,"description":"","dicomRole":false,"roleGroups":[],"rolename":"Doctor","superuser":false,"swarmPrincipals":["FolderActions","Dashboard","MWLRead","FolderRead","MWLWrite","FolderWrite","LoginAllowed","StudyPermissionsWrite","TrashActions","TrashRead"],"universalMatch":false,"uuid":"a2d823d9-4f12-4f20-a380-93e43a6968ca1","webRole":true}
+{"AETGroups":[],"AETRole":false,"description":"","dicomRole":false,"roleGroups":[],"rolename":"WebAdmin","superuser":true,"swarmPrincipals":["FolderActions","Dashboard","FileSystem","AEWrite","MWLRead","UserRead","SystemInfo","UserManagement","FolderRead","MWLWrite","FolderWrite","RoleWrite","AERead","RoleRead","StudyPermissionsWrite","LoginAllowed","ReportWrite","Queue","ReportRead","UserWrite","TrashActions","TrashRead","TCRead"],"universalMatch":true,"uuid":"ca4686c2-1140-498f-9287-1cbe8ab0145a","webRole":true}
+{"AETGroups":[],"AETRole":false,"description":"","dicomRole":false,"roleGroups":[],"rolename":"WebUser","superuser":false,"swarmPrincipals":["FolderActions","Dashboard","AEWrite","FileSystem","MWLRead","SystemInfo","FolderRead","MWLWrite","FolderWrite","AERead","LoginAllowed","StudyPermissionsWrite","Queue","ReportRead","TrashActions","TrashRead","TCRead"],"universalMatch":false,"uuid":"a2d823d9-4f12-4f20-a380-93e43a6968ca","webRole":true}
+{"AETGroups":[],"AETRole":false,"description":"","dicomRole":false,"roleGroups":[],"rolename":"Doctor","superuser":false,"swarmPrincipals":["FolderActions","Dashboard","MWLRead","FolderRead","MWLWrite","FolderWrite","LoginAllowed","StudyPermissionsWrite","TrashActions","TrashRead","TCRead"],"universalMatch":false,"uuid":"a2d823d9-4f12-4f20-a380-93e43a6968ca1","webRole":true}
{"AETGroups":[],"AETRole":false,"description":"","dicomRole":false,"roleGroups":[],"rolename":"Guest","superuser":false,"swarmPrincipals":["FolderRead","LoginAllowed"],"universalMatch":false,"uuid":"a2d823d9-4f12-4f20-a380-93e43a6968ca2","webRole":true}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
