Menu
▾
▴
[dcm4che-commits] SF.net SVN: dcm4che:[15859] dcm4chee/dcm4chee-web/trunk
|
From: <rob...@us...> - 2011-08-29 14:04:04
|
Revision: 15859
http://dcm4che.svn.sourceforge.net/dcm4che/?rev=15859&view=rev
Author: robertdavid
Date: 2011-08-29 14:03:54 +0000 (Mon, 29 Aug 2011)
Log Message:
-----------
[#WEB-462] Add typing to AE titles
Modified Paths:
--------------
dcm4chee/dcm4chee-web/trunk/dcm4chee-web-ejb/src/main/java/org/dcm4chee/web/dao/ae/AEHomeBean.java
dcm4chee/dcm4chee-web/trunk/dcm4chee-web-ejb/src/main/java/org/dcm4chee/web/dao/ae/AEHomeLocal.java
dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/java/org/dcm4chee/web/war/ae/AEListPanel.java
dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/java/org/dcm4chee/web/war/common/IndicatingAjaxFormSubmitBehavior.java
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/resources/org/dcm4chee/web/war/ae/AEListPanel.html
dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/resources/org/dcm4chee/web/war/ae/package.properties
dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/resources/org/dcm4chee/web/war/ae/package_de.properties
Modified: dcm4chee/dcm4chee-web/trunk/dcm4chee-web-ejb/src/main/java/org/dcm4chee/web/dao/ae/AEHomeBean.java
===================================================================
--- dcm4chee/dcm4chee-web/trunk/dcm4chee-web-ejb/src/main/java/org/dcm4chee/web/dao/ae/AEHomeBean.java 2011-08-29 11:53:05 UTC (rev 15858)
+++ dcm4chee/dcm4chee-web/trunk/dcm4chee-web-ejb/src/main/java/org/dcm4chee/web/dao/ae/AEHomeBean.java 2011-08-29 14:03:54 UTC (rev 15859)
@@ -68,9 +68,11 @@
}
@SuppressWarnings("unchecked")
- public List<AE> findAll() {
- List<AE> l = em.createQuery("FROM AE ae ORDER BY ae.aeGroup, ae.title")
- .getResultList();
+ public List<AE> findAll(String filter) {
+ String filterQuery = filter == null ? "" : "WHERE aeGroup = :filter ";
+ Query query = em.createQuery("FROM AE ae " + filterQuery + "ORDER BY ae.aeGroup, ae.title");
+ if (filter != null) query.setParameter("filter", filter);
+ List<AE> l = query.getResultList();
em.clear();
return l;
}
Modified: dcm4chee/dcm4chee-web/trunk/dcm4chee-web-ejb/src/main/java/org/dcm4chee/web/dao/ae/AEHomeLocal.java
===================================================================
--- dcm4chee/dcm4chee-web/trunk/dcm4chee-web-ejb/src/main/java/org/dcm4chee/web/dao/ae/AEHomeLocal.java 2011-08-29 11:53:05 UTC (rev 15858)
+++ dcm4chee/dcm4chee-web/trunk/dcm4chee-web-ejb/src/main/java/org/dcm4chee/web/dao/ae/AEHomeLocal.java 2011-08-29 14:03:54 UTC (rev 15859)
@@ -55,7 +55,7 @@
List<String> listAETitles();
- List<AE> findAll();
+ List<AE> findAll(String filter);
AE findByTitle(String title);
Modified: dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/java/org/dcm4chee/web/war/ae/AEListPanel.java
===================================================================
--- dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/java/org/dcm4chee/web/war/ae/AEListPanel.java 2011-08-29 11:53:05 UTC (rev 15858)
+++ dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/java/org/dcm4chee/web/war/ae/AEListPanel.java 2011-08-29 14:03:54 UTC (rev 15859)
@@ -45,13 +45,18 @@
import org.apache.wicket.AttributeModifier;
import org.apache.wicket.Page;
import org.apache.wicket.ResourceReference;
+import org.apache.wicket.ajax.AjaxEventBehavior;
import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.ajax.IAjaxCallDecorator;
+import org.apache.wicket.ajax.IAjaxIndicatorAware;
+import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;
import org.apache.wicket.ajax.markup.html.AjaxLink;
import org.apache.wicket.extensions.ajax.markup.html.modal.ModalWindow;
import org.apache.wicket.extensions.ajax.markup.html.modal.ModalWindow.WindowClosedCallback;
import org.apache.wicket.markup.html.CSSPackageResource;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.form.CheckBox;
+import org.apache.wicket.markup.html.form.DropDownChoice;
import org.apache.wicket.markup.html.image.Image;
import org.apache.wicket.markup.html.list.ListItem;
import org.apache.wicket.markup.html.list.OddEvenListItem;
@@ -59,7 +64,9 @@
import org.apache.wicket.markup.html.panel.Panel;
import org.apache.wicket.markup.html.resources.CompressedResourceReference;
import org.apache.wicket.model.AbstractReadOnlyModel;
+import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
+import org.apache.wicket.model.PropertyModel;
import org.apache.wicket.model.ResourceModel;
import org.apache.wicket.model.StringResourceModel;
import org.apache.wicket.model.util.ListModel;
@@ -96,6 +103,8 @@
PropertyListView<AE> list;
private Map<String, String> mppsEmulatedAETs;
+ private final IModel<String> typeSelectionModel = new Model<String>();
+
public AEListPanel(String id) {
super(id);
@@ -167,7 +176,25 @@
);
add(newAET);
newAET.add(new SecurityBehavior(getModuleName() + ":newAETLink"));
+
+ add(new Label("type.filter.label", new StringResourceModel("ae.type.filter.label", AEListPanel.this, null, new Object[]{1} ) ) );
+ add(new DropDownChoice<String>("type-selection",
+ typeSelectionModel,
+ AELicenseProviderManager.get(null).getProvider().getAETypes(
+ WebCfgDelegate.getInstance().getAETTypes())
+ )
+ .setNullValid(true)
+ .add(new AjaxFormComponentUpdatingBehavior("onchange") {
+
+ private static final long serialVersionUID = 1L;
+ @Override
+ protected void onUpdate(AjaxRequestTarget target) {
+ updateAETList();
+ target.addComponent(AEListPanel.this);
+ }
+ }));
+
add( new Label("titleHdr.label", new ResourceModel("ae.titleHdr.label")));
add( new Label("typeHdr.label", new ResourceModel("ae.typeHdr.label")));
add( new Label("hostHdr.label", new ResourceModel("ae.hostHdr.label")));
@@ -286,7 +313,7 @@
list.setModel(new ListModel<AE>());
AEHomeLocal aeHome = (AEHomeLocal) JNDIUtils.lookup(AEHomeLocal.JNDI_NAME);
List<AE> updatedList = new ArrayList<AE>();
- updatedList.addAll(aeHome.findAll());
+ updatedList.addAll(aeHome.findAll(typeSelectionModel.getObject()));
list.setModelObject(updatedList);
mppsEmulatedAETs = AEDelegate.getInstance().getEmulatedAETs();
}
@@ -304,14 +331,14 @@
list.setModelObject(updatedList);
}
- public static String getModuleName() {
- return "aelist";
- }
-
public Map<String, String> getMppsEmulatedAETs() {
if (this.mppsEmulatedAETs == null) {
mppsEmulatedAETs = AEDelegate.getInstance().getEmulatedAETs();
}
return mppsEmulatedAETs;
}
+
+ public static String getModuleName() {
+ return "aelist";
+ }
}
Modified: dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/java/org/dcm4chee/web/war/common/IndicatingAjaxFormSubmitBehavior.java
===================================================================
--- dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/java/org/dcm4chee/web/war/common/IndicatingAjaxFormSubmitBehavior.java 2011-08-29 11:53:05 UTC (rev 15858)
+++ dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/java/org/dcm4chee/web/war/common/IndicatingAjaxFormSubmitBehavior.java 2011-08-29 14:03:54 UTC (rev 15859)
@@ -50,7 +50,8 @@
public abstract class IndicatingAjaxFormSubmitBehavior extends AjaxFormSubmitBehavior implements IAjaxIndicatorAware {
private static final long serialVersionUID = 1L;
- private IAjaxIndicatorAware indicatorComponent;
+
+ public IAjaxIndicatorAware indicatorComponent;
public IndicatingAjaxFormSubmitBehavior(BaseForm form, String string, IAjaxIndicatorAware indicatorComponent) {
super(form, string);
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-08-29 11:53:05 UTC (rev 15858)
+++ dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/java/org/dcm4chee/web/war/folder/ExportPage.java 2011-08-29 14:03:54 UTC (rev 15859)
@@ -448,7 +448,7 @@
private void initDestinationAETs() {
destinationAETs.clear();
AEHomeLocal dao = (AEHomeLocal) JNDIUtils.lookup(AEHomeLocal.JNDI_NAME);
- destinationAETs.addAll(dao.findAll());
+ destinationAETs.addAll(dao.findAll(null));
if ( destinationAET == null && destinationAETs.size() > 0) {
destinationAET = destinationAETs.get(0);
}
Modified: dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/resources/org/dcm4chee/web/war/ae/AEListPanel.html
===================================================================
--- dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/resources/org/dcm4chee/web/war/ae/AEListPanel.html 2011-08-29 11:53:05 UTC (rev 15858)
+++ dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/resources/org/dcm4chee/web/war/ae/AEListPanel.html 2011-08-29 14:03:54 UTC (rev 15859)
@@ -20,6 +20,8 @@
<img wicket:id="newAETImg" alt="New AET" />
<span wicket:id="newAETText" />
</button>
+ <span wicket:id="type.filter.label" style="margin-left: 40px;" />
+ <select wicket:id="type-selection" />
<table rules="groups" class="content-table" style="clear: both; margin-top: 9px;">
<thead>
<tr>
Modified: dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/resources/org/dcm4chee/web/war/ae/package.properties
===================================================================
--- dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/resources/org/dcm4chee/web/war/ae/package.properties 2011-08-29 11:53:05 UTC (rev 15858)
+++ dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/resources/org/dcm4chee/web/war/ae/package.properties 2011-08-29 14:03:54 UTC (rev 15859)
@@ -7,6 +7,8 @@
ae.newAET.tooltip=Create new AE title
ae.newAET.tooltip.notAllowed=You reached the limit for licensed AE titles. New AE title creation is not allowed.
#
+ae.type.filter.label=Filter by:
+#
ae.mppsEmulator.title=MPPS Emulator
ae.mppsEmulator.text=MPPS Emulator
ae.mppsEmulator.tooltip=MPPS Emulator
Modified: dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/resources/org/dcm4chee/web/war/ae/package_de.properties
===================================================================
--- dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/resources/org/dcm4chee/web/war/ae/package_de.properties 2011-08-29 11:53:05 UTC (rev 15858)
+++ dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/resources/org/dcm4chee/web/war/ae/package_de.properties 2011-08-29 14:03:54 UTC (rev 15859)
@@ -7,6 +7,8 @@
ae.newAET.tooltip=Neuen AET erstellen
ae.newAET.tooltip.notAllowed=Sie haben die erlaubte Anzahl lizensierter AETs erreicht. Hinzuf\xFCgen von weiteren AETs ist nicht erlaubt.
#
+ae.type.filter.label=Filtern nach:
+#
ae.mppsEmulator.title=MPPS Emulator
ae.mppsEmulator.text=MPPS Emulator
ae.mppsEmulator.tooltip=MPPS Emulator
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|