Mentions légales du service

Skip to content
Snippets Groups Projects
Commit 62b88195 authored by Guillaume Thomazon's avatar Guillaume Thomazon
Browse files

Add parameters in url. 

Add new feilds in search panel

git-svn-id: https://scm.gforge.inria.fr/authscm/ycadoret/svn/gazelle/Maven/gazelle-proxy/trunk@33938 356b4b1a-1d2b-0410-8bf1-ffa24008f01e
parent 66d49de9
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
gazelle-proxy-common-war/src/main/webapp/messages.xhtml
+ 139
− 30
View file @ 62b88195
......@@ -8,7 +8,7 @@
<ui:define name="body">
#{dataTableStateHolder.setDescendingOn('dateReceived')}
#{messagesBean.initFromUrl()}
<a4j:form>
<rich:simpleTogglePanel switchType="client" id="search"
label="#{messages['net.ihe.gazelle.proxy.SearchCriteria']}">
......@@ -19,7 +19,9 @@
value="#{messagesBean.messageType}">
<s:selectItems value="#{messagesBean.getMessageTypes()}"
var="cmdField" label="#{cmdField.toString()}" />
<a4j:support event="onchange" reRender="search,panelOfMessages" />
<a4j:support event="onchange"
action="#{messagesBean.redirectToMessages(messagesBean.messageType,messagesBean.proxyPort,messagesBean.responderIP,messagesBean.responderPort,messagesBean.initiatorIP,messagesBean.initiatorPort,null,messagesBean.dateFrom,messagesBean.dateTo,null,null)}"
reRender="search,panelOfMessages" />
</h:selectOneMenu>
</s:decorate>
</h:panelGrid>
......@@ -28,42 +30,100 @@
<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"
actionListener="#{messagesBean.validateInitiatorIP()}" />
actionListener="#{messagesBean.validateInitiatorIP()}"
action="#{messagesBean.redirectToMessages(messagesBean.messageType,messagesBean.proxyPort,messagesBean.responderIP,messagesBean.responderPort,messagesBean.initiatorIP,messagesBean.initiatorPort,messagesBean.connectionId,messagesBean.dateFrom,messagesBean.dateTo,messagesBean.dicomAffectedSopClassUID,messagesBean.dicomCommandField)}"
ajaxSingle="true" />
</h:inputText>
<h:graphicImage value="/img/deleteJR.gif" width="14" height="14">
<a4j:support event="onclick"
action="#{messagesBean.redirectToMessages(messagesBean.messageType,messagesBean.proxyPort,messagesBean.responderIP,messagesBean.responderPort,null,messagesBean.initiatorPort,messagesBean.connectionId,messagesBean.dateFrom,messagesBean.dateTo,messagesBean.dicomAffectedSopClassUID,messagesBean.dicomCommandField)}"
reRender="search,panelOfMessages" ajaxSingle="true" />
</h:graphicImage>
</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>
<h:panelGrid columns="2">
<rich:inputNumberSpinner value="#{messagesBean.initiatorPort}"
minValue="1" maxValue="65535">
<a4j:support event="onchange" reRender="search,panelOfMessages"
action="#{messagesBean.redirectToMessages(messagesBean.messageType,messagesBean.proxyPort,messagesBean.responderIP,messagesBean.responderPort,messagesBean.initiatorIP,messagesBean.initiatorPort,messagesBean.connectionId,messagesBean.dateFrom,messagesBean.dateTo,messagesBean.dicomAffectedSopClassUID,messagesBean.dicomCommandField)}"
ajaxSingle="true" />
</rich:inputNumberSpinner>
<h:graphicImage value="/img/deleteJR.gif" width="14" height="14">
<a4j:support event="onclick"
action="#{messagesBean.redirectToMessages(messagesBean.messageType,messagesBean.proxyPort,messagesBean.responderIP,messagesBean.responderPort,messagesBean.initiatorIP,null,messagesBean.connectionId,messagesBean.dateFrom,messagesBean.dateTo,messagesBean.dicomAffectedSopClassUID,messagesBean.dicomCommandField)}"
reRender="search,panelOfMessages" ajaxSingle="true" />
</h:graphicImage>
</h:panelGrid>
</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"
actionListener="#{messagesBean.validateResponderIP()}" />
actionListener="#{messagesBean.validateResponderIP()}"
action="#{messagesBean.redirectToMessages(messagesBean.messageType,messagesBean.proxyPort,messagesBean.responderIP,messagesBean.responderPort,messagesBean.initiatorIP,messagesBean.initiatorPort,messagesBean.connectionId,messagesBean.dateFrom,messagesBean.dateTo,messagesBean.dicomAffectedSopClassUID,messagesBean.dicomCommandField)}"
ajaxSingle="true" />
</h:inputText>
<h:graphicImage value="/img/deleteJR.gif" width="14" height="14">
<a4j:support event="onclick"
action="#{messagesBean.redirectToMessages(messagesBean.messageType,messagesBean.proxyPort,null,messagesBean.responderPort,messagesBean.initiatorIP,messagesBean.initiatorPort,messagesBean.connectionId,messagesBean.dateFrom,messagesBean.dateTo,messagesBean.dicomAffectedSopClassUID,messagesBean.dicomCommandField)}"
reRender="search,panelOfMessages" ajaxSingle="true" />
</h:graphicImage>
</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>
<h:panelGrid columns="2">
<rich:inputNumberSpinner value="#{messagesBean.responderPort}"
minValue="1" maxValue="65535">
<a4j:support event="onchange" reRender="search,panelOfMessages"
action="#{messagesBean.redirectToMessages(messagesBean.messageType,messagesBean.proxyPort,messagesBean.responderIP,messagesBean.responderPort,messagesBean.initiatorIP,messagesBean.initiatorPort,messagesBean.connectionId,messagesBean.dateFrom,messagesBean.dateTo,messagesBean.dicomAffectedSopClassUID,messagesBean.dicomCommandField)}"
ajaxSingle="true" />
</rich:inputNumberSpinner>
<h:graphicImage value="/img/deleteJR.gif" width="14" height="14">
<a4j:support event="onclick"
action="#{messagesBean.redirectToMessages(messagesBean.messageType,messagesBean.proxyPort,messagesBean.responderIP,null,messagesBean.initiatorIP,messagesBean.initiatorPort,messagesBean.connectionId,messagesBean.dateFrom,messagesBean.dateTo,messagesBean.dicomAffectedSopClassUID,messagesBean.dicomCommandField)}"
reRender="search,panelOfMessages" ajaxSingle="true" />
</h:graphicImage>
</h:panelGrid>
</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}"
minValue="1" maxValue="65535">
<a4j:support event="onchange" reRender="search,panelOfMessages" />
</rich:inputNumberSpinner>
<h:panelGrid columns="2">
<rich:inputNumberSpinner value="#{messagesBean.proxyPort}"
minValue="1" maxValue="65535">
<a4j:support event="onchange" reRender="search,panelOfMessages"
action="#{messagesBean.redirectToMessages(messagesBean.messageType,messagesBean.proxyPort,messagesBean.responderIP,messagesBean.responderPort,messagesBean.initiatorIP,messagesBean.initiatorPort,messagesBean.connectionId,messagesBean.dateFrom,messagesBean.dateTo,messagesBean.dicomAffectedSopClassUID,messagesBean.dicomCommandField)}"
ajaxSingle="true" />
</rich:inputNumberSpinner>
<h:graphicImage value="/img/deleteJR.gif" width="14" height="14">
<a4j:support event="onclick"
action="#{messagesBean.redirectToMessages(messagesBean.messageType,null,messagesBean.responderIP,messagesBean.responderPort,messagesBean.initiatorIP,messagesBean.initiatorPort,messagesBean.connectionId,messagesBean.dateFrom,messagesBean.dateTo,messagesBean.dicomAffectedSopClassUID,messagesBean.dicomCommandField)}"
reRender="search,panelOfMessages" ajaxSingle="true" />
</h:graphicImage>
</h:panelGrid>
</s:decorate>
</h:panelGrid>
<h:panelGrid columns="1">
<s:decorate template="/layout/edit.xhtml">
<ui:define name="label">Connection ID</ui:define>
<h:panelGrid columns="2">
<rich:inputNumberSpinner value="#{messagesBean.connectionId}"
minValue="0" maxValue="100000000">
<a4j:support event="onchange" reRender="search,panelOfMessages"
action="#{messagesBean.redirectToMessages(messagesBean.messageType,messagesBean.proxyPort,messagesBean.responderIP,messagesBean.responderPort,messagesBean.initiatorIP,messagesBean.initiatorPort,messagesBean.connectionId,messagesBean.dateFrom,messagesBean.dateTo,messagesBean.dicomAffectedSopClassUID,messagesBean.dicomCommandField)}"
ajaxSingle="true" />
</rich:inputNumberSpinner>
<h:graphicImage value="/img/deleteJR.gif" width="14" height="14">
<a4j:support event="onclick"
action="#{messagesBean.redirectToMessages(messagesBean.messageType,messagesBean.proxyPort,messagesBean.responderIP,messagesBean.responderPort,messagesBean.initiatorIP,messagesBean.initiatorPort,null,messagesBean.dateFrom,messagesBean.dateTo,messagesBean.dicomAffectedSopClassUID,messagesBean.dicomCommandField)}"
reRender="search,panelOfMessages" ajaxSingle="true" />
</h:graphicImage>
</h:panelGrid>
</s:decorate>
</h:panelGrid>
......@@ -73,22 +133,28 @@
<h:selectOneMenu value="#{messagesBean.dicomAffectedSopClassUID}">
<f:selectItems
value="#{messagesBean.getDicomAffectedSopClassUIDs()}" />
<a4j:support event="onchange" reRender="search,panelOfMessages" />
<a4j:support event="onchange" reRender="search,panelOfMessages"
ajaxSingle="true" />
</h:selectOneMenu>
<h:graphicImage value="/img/deleteJR.gif" width="14" height="14">
<a4j:support event="onclick"
action="#{messagesBean.redirectToMessages(messagesBean.messageType,messagesBean.proxyPort,messagesBean.responderIP,messagesBean.responderPort,messagesBean.initiatorIP,messagesBean.initiatorPort,messagesBean.connectionId,messagesBean.dateFrom,messagesBean.dateTo,null,messagesBean.dicomCommandField)}"
reRender="search,panelOfMessages" ajaxSingle="true" />
</h:graphicImage>
</s:decorate>
<s:decorate template="/layout/edit.xhtml">
<ui:define name="label">#{messages['net.ihe.gazelle.proxy.DicomCommandField']}</ui:define>
<h:selectOneMenu value="#{messagesBean.dicomCommandField}">
<f:selectItems value="#{messagesBean.getDicomCommandFields()}" />
<a4j:support event="onchange" reRender="search,panelOfMessages" />
<a4j:support event="onchange" reRender="search,panelOfMessages"
ajaxSingle="true" />
</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>
<h:graphicImage value="/img/deleteJR.gif" width="14" height="14">
<a4j:support event="onclick"
action="#{messagesBean.redirectToMessages(messagesBean.messageType,messagesBean.proxyPort,messagesBean.responderIP,messagesBean.responderPort,messagesBean.initiatorIP,messagesBean.initiatorPort,messagesBean.connectionId,messagesBean.dateFrom,messagesBean.dateTo,messagesBean.dicomAffectedSopClassUID,null)}"
reRender="search,panelOfMessages" ajaxSingle="true" />
</h:graphicImage>
</s:decorate>
</h:panelGrid>
......@@ -100,8 +166,14 @@
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()}" />
actionListener="#{messagesBean.validateDate()}"
ajaxSingle="true" />
</rich:calendar>
<h:graphicImage value="/img/deleteJR.gif" width="14" height="14">
<a4j:support event="onclick"
action="#{messagesBean.redirectToMessages(messagesBean.messageType,messagesBean.proxyPort,messagesBean.responderIP,messagesBean.responderPort,messagesBean.initiatorIP,messagesBean.initiatorPort,messagesBean.connectionId,null,messagesBean.dateTo,messagesBean.dicomAffectedSopClassUID,messagesBean.dicomCommandField)}"
reRender="search,panelOfMessages" ajaxSingle="true" />
</h:graphicImage>
</s:div>
</s:decorate>
<rich:spacer width="20px" />
......@@ -112,18 +184,55 @@
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()}" />
actionListener="#{messagesBean.validateDate()}"
ajaxSingle="true" />
</rich:calendar>
<h:graphicImage value="/img/deleteJR.gif" width="14" height="14">
<a4j:support event="onclick"
action="#{messagesBean.redirectToMessages(messagesBean.messageType,messagesBean.proxyPort,messagesBean.responderIP,messagesBean.responderPort,messagesBean.initiatorIP,messagesBean.initiatorPort,messagesBean.connectionId,messagesBean.dateFrom,null,messagesBean.dicomAffectedSopClassUID,messagesBean.dicomCommandField)}"
reRender="search,panelOfMessages" ajaxSingle="true" />
</h:graphicImage>
</s:div>
</s:decorate>
</h:panelGrid>
<h:panelGrid columns="3">
<s:decorate template="/layout/edit.xhtml">
<ui:define name="label">Rapid date selection :</ui:define>
<h:selectOneMenu id="selectDate"
value="#{messagesBean.currentSelectDate}">
<f:selectItem id="item" itemLabel="--" itemValue="1" />
<f:selectItem id="item1" itemLabel="Last hour"
itemValue="last hour" />
<f:selectItem id="item2" itemLabel="Today" itemValue="today" />
<f:selectItem id="item3" itemLabel="Yesterday"
itemValue="yesterday" />
<f:selectItem id="item4" itemLabel="Last week"
itemValue="last week" />
<f:selectItem id="item5" itemLabel="Last month"
itemValue="last month" />
<f:selectItem id="item6" itemLabel="This week"
itemValue="this week" />
<f:selectItem id="item7" itemLabel="This month"
itemValue="this month" />
<a4j:support event="onchange" reRender="search,panelOfMessages"
ajaxSingle="true"
actionListener="#{messagesBean.selectDate(messagesBean.currentSelectDate)}"
action="#{messagesBean.redirectToMessages(messagesBean.messageType,messagesBean.proxyPort,messagesBean.responderIP,messagesBean.responderPort,messagesBean.initiatorIP,messagesBean.initiatorPort,messagesBean.connectionId,messagesBean.dateFrom,messagesBean.dateTo,messagesBean.dicomAffectedSopClassUID,messagesBean.dicomCommandField)}" />
</h:selectOneMenu>
<h:graphicImage value="/img/deleteJR.gif" width="14" height="14">
<a4j:support event="onclick"
action="#{messagesBean.redirectToMessages(messagesBean.messageType,messagesBean.proxyPort,messagesBean.responderIP,messagesBean.responderPort,messagesBean.initiatorIP,messagesBean.initiatorPort,messagesBean.connectionId,null,null,messagesBean.dicomAffectedSopClassUID,messagesBean.dicomCommandField)}"
reRender="search,panelOfMessages" ajaxSingle="true" />
</h:graphicImage>
</s:decorate>
</h:panelGrid>
<br />
<a4j:commandButton actionListener="#{messagesBean.clearFilter()}"
reRender="search,panelOfMessages"
value="#{messages['net.ihe.gazelle.proxy.Reset']}"
styleClass="commandButton" />
<a4j:commandButton reRender="search,panelOfMessages"
value="Refresh"
<a4j:commandButton reRender="search,panelOfMessages" value="Refresh"
styleClass="commandButton" />
</rich:simpleTogglePanel>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment