Menu
▾
▴
[dcm4che-commits] SF.net SVN: dcm4che:[15705] dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/ src/main
|
From: <jav...@us...> - 2011-07-25 08:48:37
|
Revision: 15705
http://dcm4che.svn.sourceforge.net/dcm4che/?rev=15705&view=rev
Author: javawilli
Date: 2011-07-25 08:48:30 +0000 (Mon, 25 Jul 2011)
Log Message:
-----------
[#WEB-414] Details view on file level is empty
Modified Paths:
--------------
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/StudyListPage.java
dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/resources/org/dcm4chee/web/war/folder/FilePanel.html
dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/resources/org/dcm4chee/web/war/folder/StudyListPage.html
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-25 08:14:15 UTC (rev 15704)
+++ dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/java/org/dcm4chee/web/war/folder/FilePanel.java 2011-07-25 08:48:30 UTC (rev 15705)
@@ -74,18 +74,18 @@
}
});
- add(new DateTimeLabel("file.createdTime"));
- add(new Label("file.fileSize"));
- add(new Label("file.transferSyntaxUID"));
- add(new Label("file.md5Sum"));
- add(new DateTimeLabel("file.timeOfLastMD5SumCheck"));
- add(new Label("file.fileStatus"));
- add(new Label("file.filePath"));
- add(new Label("file.fileSystem.directoryPath"));
- add(new Label("file.fileSystem.groupID"));
- add(new Label("file.fileSystem.retrieveAET"));
- add(new Label("file.fileSystem.availability"));
- add(new Label("file.fileSystem.status"));
- add(new Label("file.fileSystem.userInfo"));
+ add(new DateTimeLabel("fileObject.createdTime"));
+ add(new Label("fileObject.fileSize"));
+ add(new Label("fileObject.transferSyntaxUID"));
+ add(new Label("fileObject.md5Sum"));
+ add(new DateTimeLabel("fileObject.timeOfLastMD5SumCheck"));
+ add(new Label("fileObject.fileStatus"));
+ add(new Label("fileObject.filePath"));
+ add(new Label("fileObject.fileSystem.directoryPath"));
+ add(new Label("fileObject.fileSystem.groupID"));
+ add(new Label("fileObject.fileSystem.retrieveAET"));
+ add(new Label("fileObject.fileSystem.availability"));
+ add(new Label("fileObject.fileSystem.status"));
+ add(new Label("fileObject.fileSystem.userInfo"));
}
}
Modified: dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/java/org/dcm4chee/web/war/folder/StudyListPage.java
===================================================================
--- dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/java/org/dcm4chee/web/war/folder/StudyListPage.java 2011-07-25 08:14:15 UTC (rev 15704)
+++ dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/java/org/dcm4chee/web/war/folder/StudyListPage.java 2011-07-25 08:48:30 UTC (rev 15705)
@@ -2059,6 +2059,21 @@
item.add(new Label("fileObject.fileSystem.directoryPath").add(tooltip));
item.add(new Label("fileObject.filePath").add(tooltip));
item.add(new Label("fileObject.fileSystem.availability").add(tooltip));
+ item.add(new AjaxFallbackLink<Object>("toggledetails") {
+
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ fileModel.setDetails(!fileModel.isDetails());
+ if (target != null) {
+ target.addComponent(patientListItem);
+ }
+ }
+
+ }.add(new Image("detailImg",ImageManager.IMAGE_COMMON_DICOM_DETAILS)
+ .add(new ImageSizeBehaviour())
+ .add(tooltip)));
item.add(getFileDisplayLink(modalWindow, fileModel, tooltip));
item.add(new AjaxCheckBox("selected") {
private static final long serialVersionUID = 1L;
@@ -2072,6 +2087,17 @@
target.addComponent(this);
}}.setOutputMarkupId(true)
.add(tooltip));
+ WebMarkupContainer details = new WebMarkupContainer("details") {
+
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ public boolean isVisible() {
+ return fileModel.isDetails();
+ }
+ };
+ item.add(details);
+ details.add(new FilePanel("file", fileModel));
}
}
Modified: dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/resources/org/dcm4chee/web/war/folder/FilePanel.html
===================================================================
--- dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/resources/org/dcm4chee/web/war/folder/FilePanel.html 2011-07-25 08:14:15 UTC (rev 15704)
+++ dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/resources/org/dcm4chee/web/war/folder/FilePanel.html 2011-07-25 08:48:30 UTC (rev 15705)
@@ -21,55 +21,55 @@
<tbody>
<tr>
<td>File Date/Time</td>
- <td wicket:id="file.createdTime">[File Date/Time]</td>
+ <td wicket:id="fileObject.createdTime">[File Date/Time]</td>
</tr>
<tr>
<td>Size</td>
- <td wicket:id="file.fileSize">[Size]</td>
+ <td wicket:id="fileObject.fileSize">[Size]</td>
</tr>
<tr>
<td>Transfer Syntax UID</td>
- <td wicket:id="file.transferSyntaxUID">[Transfer Syntax UID]</td>
+ <td wicket:id="fileObject.transferSyntaxUID">[Transfer Syntax UID]</td>
</tr>
<tr>
<td>MD5 sum</td>
- <td wicket:id="file.md5Sum">[MD5 sum]</td>
+ <td wicket:id="fileObject.md5Sum">[MD5 sum]</td>
</tr>
<tr>
<td>Time Of last MD5 sum check</td>
- <td wicket:id="file.timeOfLastMD5SumCheck">[Time Of last MD5 sum check]</td>
+ <td wicket:id="fileObject.timeOfLastMD5SumCheck">[Time Of last MD5 sum check]</td>
</tr>
<tr>
<td>File Status</td>
- <td wicket:id="file.fileStatus">[File Status]</td>
+ <td wicket:id="fileObject.fileStatus">[File Status]</td>
</tr>
<tr>
<td>File Path</td>
- <td wicket:id="file.filePath">[File Path]</td>
+ <td wicket:id="fileObject.filePath">[File Path]</td>
</tr>
<tr>
<td>File System Path/URL</td>
- <td wicket:id="file.fileSystem.directoryPath">[File System Path/URL]</td>
+ <td wicket:id="fileObject.fileSystem.directoryPath">[File System Path/URL]</td>
</tr>
<tr>
<td>File System Group ID</td>
- <td wicket:id="file.fileSystem.groupID">[File System Group ID]</td>
+ <td wicket:id="fileObject.fileSystem.groupID">[File System Group ID]</td>
</tr>
<tr>
<td>Retrieve AET</td>
- <td wicket:id="file.fileSystem.retrieveAET">[Retrieve AET]</td>
+ <td wicket:id="fileObject.fileSystem.retrieveAET">[Retrieve AET]</td>
</tr>
<tr>
<td>Availability</td>
- <td wicket:id="file.fileSystem.availability">[Availability]</td>
+ <td wicket:id="fileObject.fileSystem.availability">[Availability]</td>
</tr>
<tr>
<td>File System Status</td>
- <td wicket:id="file.fileSystem.status">[File System Status]</td>
+ <td wicket:id="fileObject.fileSystem.status">[File System Status]</td>
</tr>
<tr>
<td>File System User Info</td>
- <td wicket:id="file.fileSystem.userInfo">[File System User Info]</td>
+ <td wicket:id="fileObject.fileSystem.userInfo">[File System User Info]</td>
</tr>
</tbody>
</table>
Modified: dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/resources/org/dcm4chee/web/war/folder/StudyListPage.html
===================================================================
--- dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/resources/org/dcm4chee/web/war/folder/StudyListPage.html 2011-07-25 08:14:15 UTC (rev 15704)
+++ dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/resources/org/dcm4chee/web/war/folder/StudyListPage.html 2011-07-25 08:48:30 UTC (rev 15705)
@@ -492,6 +492,7 @@
</td>
<td wicket:id="fileObject.fileSystem.availability">[Availability]</td>
<td>
+ <a wicket:id="toggledetails" href="#"><img wicket:id="detailImg" alt="D" /></a>
</td>
<td>
</td>
@@ -506,6 +507,11 @@
</td>
<td><input wicket:id="selected" type="checkbox" /></td>
</tr>
+ <tr wicket:id="details" class="file" style="border-top-style: none;">
+ <td colspan="15">
+ <div wicket:id="file"></div>
+ </td>
+ </tr>
</wicket:container>
</wicket:container>
</wicket:container>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
