Commit 1b9cdcc5 by Tuomas Riihimäki

Add link to quemgmt and fix queue size

1 parent 979346f1
Showing with 9 additions and 5 deletions
...@@ -44,11 +44,13 @@ ...@@ -44,11 +44,13 @@
<h:outputText value="#{queueManageView.now}"> <h:outputText value="#{queueManageView.now}">
<f:convertDateTime pattern="#{sessionHandler.datetimeFormat}" timeZone="#{sessionHandler.timezone}" /> <f:convertDateTime pattern="#{sessionHandler.datetimeFormat}" timeZone="#{sessionHandler.timezone}" />
</h:outputText> </h:outputText>
<h2>Currently reserving</h2> <h2>Currently reserving</h2>
<p:dataTable var="u" value="#{queueManageView.userReserving}"> <p:dataTable var="u" value="#{queueManageView.userReserving}">
<p:column> <p:column>
<h:outputText value="#{u.user.user.login}" /> <p:link outcome="/user/edit" value="#{u.user.user.login}">
<f:param name="userid" value="#{u.user.id}" />
</p:link>
</p:column> </p:column>
<p:column headerText="Created"> <p:column headerText="Created">
<h:outputText value="#{u.created}"> <h:outputText value="#{u.created}">
...@@ -56,7 +58,7 @@ ...@@ -56,7 +58,7 @@
</h:outputText> </h:outputText>
</p:column> </p:column>
<p:column headerText="Reservation timeout"> <p:column headerText="Reservation timeout">
<h:outputText value="#{u.reservationTimeout}"> <h:outputText value="#{u.reservationTimeout}">
<f:convertDateTime pattern="#{sessionHandler.datetimeFormat}" timeZone="#{sessionHandler.timezone}" /> <f:convertDateTime pattern="#{sessionHandler.datetimeFormat}" timeZone="#{sessionHandler.timezone}" />
</h:outputText> </h:outputText>
...@@ -65,10 +67,12 @@ ...@@ -65,10 +67,12 @@
<h2>In queue</h2> <h2>In queue</h2>
Queue size: #{queueManageView.userQueue.size()}<br/> Queue size: #{queueManageView.userQueue.rowCount}<br />
<p:dataTable var="u" value="#{queueManageView.userQueue}"> <p:dataTable var="u" value="#{queueManageView.userQueue}">
<p:column> <p:column>
<h:outputText value="#{u.user.user.login}" /> <p:link outcome="/user/edit" value="#{u.user.user.login}">
<f:param name="userid" value="#{u.user.id}" />
</p:link>
</p:column> </p:column>
<p:column headerText="Created"> <p:column headerText="Created">
<h:outputText value="#{u.created}"> <h:outputText value="#{u.created}">
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!