Menu
▾
▴
[dcm4che-commits] SF.net SVN: dcm4che:[17039] dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/ src/main
|
From: <jav...@us...> - 2012-08-31 13:53:21
|
Revision: 17039
http://dcm4che.svn.sourceforge.net/dcm4che/?rev=17039&view=rev
Author: javawilli
Date: 2012-08-31 13:53:11 +0000 (Fri, 31 Aug 2012)
Log Message:
-----------
[#WEB-826] Internal error when searching for MWL in MPPS-MWL linking dialogue
Modified Paths:
--------------
dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/java/org/dcm4chee/web/war/folder/Mpps2MwlLinkPage.java
dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/java/org/dcm4chee/web/war/worklist/modality/MWLItemListView.java
dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/java/org/dcm4chee/web/war/worklist/modality/ModalityWorklistPanel.java
dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/java/org/dcm4chee/web/war/worklist/modality/model/MWLItemModel.java
dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/resources/org/dcm4chee/web/war/folder/Mpps2MwlLinkPage$Mpps2MwlLinkPanelM.html
Modified: dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/java/org/dcm4chee/web/war/folder/Mpps2MwlLinkPage.java
===================================================================
--- dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/java/org/dcm4chee/web/war/folder/Mpps2MwlLinkPage.java 2012-08-31 09:22:09 UTC (rev 17038)
+++ dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/java/org/dcm4chee/web/war/folder/Mpps2MwlLinkPage.java 2012-08-31 13:53:11 UTC (rev 17039)
@@ -49,6 +49,7 @@
import javax.management.MBeanException;
import javax.management.ReflectionException;
+import org.apache.wicket.AttributeModifier;
import org.apache.wicket.Component;
import org.apache.wicket.Page;
import org.apache.wicket.ResourceReference;
@@ -355,8 +356,13 @@
protected WebMarkupContainer addExtendedStudySearch(final Form<?> form) {
return null;
}
-
+
@Override
+ protected MWLItemListView getMWLItemListView() {
+ return new LinkMWLItemListView("mwlitems", getViewPort().getMWLItemModels(), this);
+ }
+
+ @Override
public void addMwlActions(final ListItem<MWLItemModel> item, WebMarkupContainer valueContainer, final MWLItemListView mwlListView) {
final MWLItemModel mwlItemModel = item.getModelObject();
@@ -471,6 +477,44 @@
}
}
+ public class LinkMWLItemListView extends MWLItemListView {
+
+ private static final long serialVersionUID = 1L;
+
+ private MwlActionProvider mwlActionProvider;
+ private WebMarkupContainer mwlitem;
+
+ public LinkMWLItemListView(String id, List<MWLItemModel> list) {
+ super(id, list);
+ }
+
+ public LinkMWLItemListView(String id, List<MWLItemModel> list, MwlActionProvider mwlActionProvider) {
+ this(id, list);
+ this.mwlActionProvider = mwlActionProvider;
+ }
+ @Override
+ protected void populateItem(final ListItem<MWLItemModel> item) {
+
+ item.add(this.mwlitem = new WebMarkupContainer("mwlitem"));
+ this.mwlitem.add(new AttributeModifier("class", true, new Model<String>(getOddEvenClass(item))));
+
+ TooltipBehaviour tooltip = new TooltipBehaviour("mw.content.data.");
+
+ this.mwlitem.add(new Label("patientName").add(tooltip))
+ .add(new Label("patientIDAndIssuer").add(tooltip))
+ .add(new DateTimeLabel("birthDate").setWithoutTime(true).add(tooltip))
+ .add(new Label("SPSDescription").add(tooltip))
+ .add(new Label("SPSModality").add(tooltip))
+ .add(new DateTimeLabel("startDate").add(tooltip))
+ .add(new Label("accessionNumber").add(tooltip))
+ .add(new Label("stationAET").add(tooltip))
+ .add(new Label("stationName").add(tooltip));
+
+ if (mwlActionProvider != null)
+ mwlActionProvider.addMwlActions(item, mwlitem, LinkMWLItemListView.this);
+ }
+ }
+
@SuppressWarnings("unused") //used in a PropertyModel
private class PpsInfoModel implements Serializable{
private static final long serialVersionUID = 1L;
Modified: dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/java/org/dcm4chee/web/war/worklist/modality/MWLItemListView.java
===================================================================
--- dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/java/org/dcm4chee/web/war/worklist/modality/MWLItemListView.java 2012-08-31 09:22:09 UTC (rev 17038)
+++ dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/java/org/dcm4chee/web/war/worklist/modality/MWLItemListView.java 2012-08-31 13:53:11 UTC (rev 17039)
@@ -70,7 +70,7 @@
this(id, list);
this.mwlActionProvider = mwlActionProvider;
}
- private String getOddEvenClass(ListItem<?> item) {
+ protected String getOddEvenClass(ListItem<?> item) {
return item.getIndex() % 2 == 0 ? "even" : "odd";
}
Modified: dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/java/org/dcm4chee/web/war/worklist/modality/ModalityWorklistPanel.java
===================================================================
--- dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/java/org/dcm4chee/web/war/worklist/modality/ModalityWorklistPanel.java 2012-08-31 09:22:09 UTC (rev 17038)
+++ dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/java/org/dcm4chee/web/war/worklist/modality/ModalityWorklistPanel.java 2012-08-31 13:53:11 UTC (rev 17039)
@@ -219,7 +219,7 @@
listPanel = new WebMarkupContainer("listPanel");
add(listPanel);
listPanel.setOutputMarkupId(true);
- listPanel.add(new MWLItemListView("mwlitems", viewport.getMWLItemModels(), this));
+ listPanel.add(getMWLItemListView());
confirm = new ConfirmationWindow<MWLItemModel>("confirm") {
@@ -239,7 +239,7 @@
add(confirm);
}
-
+
protected ViewPort initViewPort() {
return ((AuthenticatedWebSession) getSession()).getMwViewPort();
}
@@ -715,6 +715,10 @@
return status;
}
+ protected MWLItemListView getMWLItemListView() {
+ return new MWLItemListView("mwlitems", viewport.getMWLItemModels(), this);
+ }
+
//MwlActionProvider (details and edit)
public void addMwlActions(final ListItem<MWLItemModel> item, WebMarkupContainer valueContainer, final MWLItemListView mwlListView) {
Modified: dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/java/org/dcm4chee/web/war/worklist/modality/model/MWLItemModel.java
===================================================================
--- dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/java/org/dcm4chee/web/war/worklist/modality/model/MWLItemModel.java 2012-08-31 09:22:09 UTC (rev 17038)
+++ dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/java/org/dcm4chee/web/war/worklist/modality/model/MWLItemModel.java 2012-08-31 13:53:11 UTC (rev 17039)
@@ -106,6 +106,21 @@
public String getPatientName() {
return patAttrs.getString(Tag.PatientName);
}
+ public String getPatientID() {
+ return patAttrs.getString(Tag.PatientID);
+ }
+ public String getIssuerOfPatientID() {
+ return patAttrs.getString(Tag.IssuerOfPatientID);
+ }
+ public String getPatientIDAndIssuer() {
+ String id = getPatientID();
+ String issuer = getIssuerOfPatientID();
+ if (issuer == null) {
+ return id == null ? "" : id;
+ }
+ return id == null ? " / "+issuer : id+" / "+issuer;
+
+ }
public Date getBirthDate() {
return patAttrs.getDate(Tag.PatientBirthDate);
}
Modified: dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/resources/org/dcm4chee/web/war/folder/Mpps2MwlLinkPage$Mpps2MwlLinkPanelM.html
===================================================================
--- dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/resources/org/dcm4chee/web/war/folder/Mpps2MwlLinkPage$Mpps2MwlLinkPanelM.html 2012-08-31 09:22:09 UTC (rev 17038)
+++ dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/resources/org/dcm4chee/web/war/folder/Mpps2MwlLinkPage$Mpps2MwlLinkPanelM.html 2012-08-31 13:53:11 UTC (rev 17039)
@@ -209,7 +209,7 @@
<wicket:container wicket:id="mwlitems">
<tr wicket:id="mwlitem">
<td wicket:id="cell" class="expand"></td>
- <td wicket:id="patientID">[Patient ID]</td>
+ <td wicket:id="patientIDAndIssuer">[Patient ID]</td>
<td wicket:id="patientName">[Patient Name]</td>
<td wicket:id="birthDate">[Birth date]</td>
<td wicket:id="SPSDescription">[Scheduled Procedure Step Description]</td>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|