From 3ecc9c8a24fee4164f8c4a30fb7150d2c422974f Mon Sep 17 00:00:00 2001
From: Guillaume Thomazon <gtn@kereval.com>
Date: Fri, 15 Feb 2013 14:30:32 +0000
Subject: [PATCH] Add validation IP. Add Connection ID buton. Update calendar
selection. Modify layout.
git-svn-id: https://scm.gforge.inria.fr/authscm/ycadoret/svn/gazelle/Maven/gazelle-proxy/trunk@33593 356b4b1a-1d2b-0410-8bf1-ffa24008f01e
---
.../src/main/webapp/messages.xhtml | 77 +++++++++++--------
1 file changed, 46 insertions(+), 31 deletions(-)
diff --git a/gazelle-proxy-common-war/src/main/webapp/messages.xhtml b/gazelle-proxy-common-war/src/main/webapp/messages.xhtml
index 9830e395..3069fd74 100644
--- a/gazelle-proxy-common-war/src/main/webapp/messages.xhtml
+++ b/gazelle-proxy-common-war/src/main/webapp/messages.xhtml
@@ -5,6 +5,7 @@
xmlns:h="http://java.sun.com/jsf/html"
xmlns:rich="http://richfaces.org/rich"
xmlns:a4j="http://richfaces.org/a4j" template="layout/template.xhtml">
+
<ui:define name="body">
#{dataTableStateHolder.setDescendingOn('dateReceived')}
@@ -21,42 +22,42 @@
<a4j:support event="onchange" reRender="search,panelOfMessages" />
</h:selectOneMenu>
</s:decorate>
- <s:decorate></s:decorate>
-
+ </h:panelGrid>
+ <h:panelGrid columns="3">
<s:decorate id="initiatorIPDeco" template="/layout/edit.xhtml">
<ui:define name="label">#{messages['net.ihe.gazelle.proxy.InitiatorsIP']}</ui:define>
<h:inputText id="initiatorIP" value="#{messagesBean.initiatorIP}">
- <a4j:support event="onchange" reRender="search,panelOfMessages" />
+ <a4j:support event="onchange" reRender="search,panelOfMessages"
+ actionListener="#{messagesBean.validateInitiatorIP()}" />
</h:inputText>
</s:decorate>
-
+ <rich:spacer width="20px" />
<s:decorate id="initiatorPortDeco" template="/layout/edit.xhtml">
<ui:define name="label">#{messages['net.ihe.gazelle.proxy.InitiatorsPort']}</ui:define>
-
<rich:inputNumberSpinner value="#{messagesBean.initiatorPort}"
minValue="1" maxValue="65535">
<a4j:support event="onchange" reRender="search,panelOfMessages" />
</rich:inputNumberSpinner>
-
</s:decorate>
<s:decorate id="responderIPDeco" template="/layout/edit.xhtml">
<ui:define name="label">#{messages['net.ihe.gazelle.proxy.RespondersIP']}</ui:define>
<h:inputText id="responderIP" value="#{messagesBean.responderIP}">
- <a4j:support event="onchange" reRender="search,panelOfMessages" />
+ <a4j:support event="onchange" reRender="search,panelOfMessages"
+ actionListener="#{messagesBean.validateResponderIP()}" />
</h:inputText>
</s:decorate>
-
+ <rich:spacer width="20px" />
<s:decorate id="responderPortDeco" template="/layout/edit.xhtml">
<ui:define name="label">#{messages['net.ihe.gazelle.proxy.RespondersPort']}</ui:define>
-
<rich:inputNumberSpinner value="#{messagesBean.responderPort}"
minValue="1" maxValue="65535">
<a4j:support event="onchange" reRender="search,panelOfMessages" />
</rich:inputNumberSpinner>
</s:decorate>
-
+ </h:panelGrid>
+ <h:panelGrid columns="2">
<s:decorate id="proxyPortDeco" template="/layout/edit.xhtml">
<ui:define name="label">#{messages['net.ihe.gazelle.proxy.ProxysPort']}</ui:define>
<rich:inputNumberSpinner value="#{messagesBean.proxyPort}"
@@ -64,28 +65,9 @@
<a4j:support event="onchange" reRender="search,panelOfMessages" />
</rich:inputNumberSpinner>
</s:decorate>
- <s:decorate></s:decorate>
-
- <s:decorate id="dateFromDeco" template="/layout/edit.xhtml">
- <ui:define name="label">#{messages['net.ihe.gazelle.proxy.DateFrom']}</ui:define>
- <rich:calendar value="#{messagesBean.dateFrom}" popup="true"
- showApplyButton="true" datePattern="d/M/yy HH:mm"
- cellWidth="24px" cellHeight="22px" style="width:200px">
- <a4j:support event="onchange" reRender="search,panelOfMessages" />
- </rich:calendar>
- </s:decorate>
- <s:decorate id="dateToDeco" template="/layout/edit.xhtml">
- <ui:define name="label">#{messages['net.ihe.gazelle.proxy.DateTo']}</ui:define>
- <rich:calendar value="#{messagesBean.dateTo}" popup="true"
- showApplyButton="true" datePattern="d/M/yy HH:mm"
- cellWidth="24px" cellHeight="22px" style="width:200px">
- <a4j:support event="onchange" reRender="search,panelOfMessages" />
- </rich:calendar>
- </s:decorate>
</h:panelGrid>
<h:panelGrid columns="1" rendered="#{messagesBean.isDICOM()}">
-
<s:decorate template="/layout/edit.xhtml">
<ui:define name="label">#{messages['net.ihe.gazelle.proxy.DICOMAffectedSopClassUID']}</ui:define>
<h:selectOneMenu value="#{messagesBean.dicomAffectedSopClassUID}">
@@ -101,7 +83,39 @@
<a4j:support event="onchange" reRender="search,panelOfMessages" />
</h:selectOneMenu>
</s:decorate>
+ <s:decorate template="/layout/edit.xhtml">
+ <ui:define name="label">Connection ID</ui:define>
+ <rich:inputNumberSpinner value="#{messagesBean.connectionId}"
+ minValue="0" maxValue="100000000">
+ <a4j:support event="onchange" reRender="search,panelOfMessages" />
+ </rich:inputNumberSpinner>
+ </s:decorate>
+ </h:panelGrid>
+ <h:panelGrid columns="3">
+ <s:decorate id="dateFromDeco" template="/layout/edit.xhtml">
+ <ui:define name="label">#{messages['net.ihe.gazelle.proxy.DateFrom']}</ui:define>
+ <s:div width="300px">
+ <rich:calendar id="datefrom" value="#{messagesBean.dateFrom}"
+ popup="true" showApplyButton="true" datePattern="d/M/yy HH:mm"
+ cellWidth="24px" cellHeight="22px" style="width:200px">
+ <a4j:support event="onchanged" reRender="search,panelOfMessages"
+ actionListener="#{messagesBean.validateDate()}" />
+ </rich:calendar>
+ </s:div>
+ </s:decorate>
+ <rich:spacer width="20px" />
+ <s:decorate id="dateToDeco" template="/layout/edit.xhtml">
+ <ui:define name="label">#{messages['net.ihe.gazelle.proxy.DateTo']}</ui:define>
+ <s:div width="300px">
+ <rich:calendar id="dateto" value="#{messagesBean.dateTo}"
+ popup="true" showApplyButton="true" datePattern="d/M/yy HH:mm"
+ cellWidth="24px" cellHeight="22px" style="width:200px">
+ <a4j:support event="onchanged" reRender="search,panelOfMessages"
+ actionListener="#{messagesBean.validateDate()}" />
+ </rich:calendar>
+ </s:div>
+ </s:decorate>
</h:panelGrid>
<a4j:commandButton actionListener="#{messagesBean.clearFilter()}"
@@ -109,7 +123,7 @@
value="#{messages['net.ihe.gazelle.proxy.Reset']}"
styleClass="commandButton" />
<a4j:commandButton reRender="search,panelOfMessages"
- value="#{messages['net.ihe.gazelle.proxy.Find']}"
+ value="Refresh"
styleClass="commandButton" />
</rich:simpleTogglePanel>
@@ -117,7 +131,8 @@
<s:div id="panelOfMessages">
<ui:include src="messageList.xhtml">
- <ui:param name="messagesList" value="#{messagesBean.messageDataModel}" />
+ <ui:param name="messagesList"
+ value="#{messagesBean.messageDataModel}" />
</ui:include>
</s:div>
--
GitLab