Skip to content

Riina Antikainen / Moya

Go to a project
Commit fa617d3b by Tuukka Kivilahti
Options

queue stuff

1 parent da9d3e91
Inline Side-by-side
Showing with 19 additions and 21 deletions
code/moya-beans/ejbModule/fi/codecrew/moya/beans/QueueBean.java
...@@ -249,12 +249,7 @@ public class QueueBean implements QueueBeanLocal { ...@@ -249,12 +249,7 @@ public class QueueBean implements QueueBeanLocal {
@Lock(LockType.READ) @Lock(LockType.READ)
@Override @Override
public boolean isQueueEnabled() { public boolean isQueueEnabled() {
boolean ret = false; return eventbean.getPropertyBoolean(LanEventPropertyKey.MAP_QUEUE);
LanEventProperty mapque = eventbean.getProperty(LanEventPropertyKey.MAP_QUEUE);
if (mapque != null)
ret = mapque.isBooleanValue();
return ret;
} }
@Lock(LockType.READ) @Lock(LockType.READ)
......
code/moya-web/WebContent/neomap/view.xhtml
...@@ -22,8 +22,7 @@ ...@@ -22,8 +22,7 @@
action="#{ajaxMapView.placeClicked()}" /> action="#{ajaxMapView.placeClicked()}" />
</h:form> </h:form>
--> -->
<p:dialog rendered="#{ajaxMapView.isMgmtPermission()}" <p:dialog rendered="#{ajaxMapView.isMgmtPermission()}" visible="#{!empty ajaxMapView.place}" id="fbdiag">
visible="#{!empty ajaxMapView.place}" id="fbdiag">
Clicked place name : #{ajaxMapView.place.name}; Clicked place name : #{ajaxMapView.place.name};
<h:link rendered="#{!empty ajaxMapView.place}" outcome="/place/edit"> <h:link rendered="#{!empty ajaxMapView.place}" outcome="/place/edit">
<f:param name="placeid" value="#{ajaxMapView.place.id}" /> <f:param name="placeid" value="#{ajaxMapView.place.id}" />
...@@ -44,20 +43,18 @@ ...@@ -44,20 +43,18 @@
action="#{ajaxMapView.buySelectedPlaces()}" ajax="false" /> action="#{ajaxMapView.buySelectedPlaces()}" ajax="false" />
</h:form> </h:form>
</div> </div>
<h:form> <p:outputPanel rendered="#{ajaxMapView.queueEnabled}">
<p:commandButton value="#{i18n['mapView.enterQueue']}" <h:form>
action="#{ajaxMapView.enterQueue()}" ajax="false" /> <p:commandButton value="#{i18n['mapView.enterQueue']}" action="#{ajaxMapView.enterQueue()}" ajax="false" />
<p:commandButton value="#{i18n['mapView.check']}" <p:commandButton value="#{i18n['mapView.check']}" action="#{ajaxMapView.checkReserving()}" />
action="#{ajaxMapView.checkReserving()}" /> </h:form>
</h:form> queueEntry #{ajaxMapView.queueEntry} <br />
queueEntry #{ajaxMapView.queueEntry} <br /> QueuePosition: #{ajaxMapView.queuePosition} <br />
QueuePosition: #{ajaxMapView.queuePosition} <br /> Available places to select: #{ajaxMapView.placesLeftToSelect} <br />
Available places to select: #{ajaxMapView.placesLeftToSelect} <br /> isReserving #{ajaxMapView.reserving} <br />
isReserving #{ajaxMapView.reserving} <br /> </p:outputPanel>
<svg id="seatmap" style="margin: auto; border: 1px solid black;" <svg id="seatmap" style="margin: auto; border: 1px solid black;" width="#{ajaxMapView.map.width}px" height="#{ajaxMapView.map.height}px" />
width="#{ajaxMapView.map.width}px"
height="#{ajaxMapView.map.height}px" />
<script type="text/javascript"> <script type="text/javascript">
px = placemap({ px = placemap({
element : document.getElementById("seatmap"), element : document.getElementById("seatmap"),
......
code/moya-web/src/main/resources/fi/codecrew/moya/resources/i18n.properties
...@@ -456,3 +456,5 @@ etickets.placeinfo=Paikkatiedot ...@@ -456,3 +456,5 @@ etickets.placeinfo=Paikkatiedot
etickets.eticketcode=Lippu etickets.eticketcode=Lippu
etickets.placemap=Paikat kartalla etickets.placemap=Paikat kartalla
placegroup.showEticket=N\u00E4yt\u00E4 lippu placegroup.showEticket=N\u00E4yt\u00E4 lippu
mapView.enterQueue=Liity jonoon
mapView.check=P\u00E4ivit\u00E4 jonopaikka
code/moya-web/src/main/resources/fi/codecrew/moya/resources/i18n_en.properties
...@@ -1653,3 +1653,5 @@ etickets.placeinfo=Placeinfo ...@@ -1653,3 +1653,5 @@ etickets.placeinfo=Placeinfo
etickets.eticketcode=Ticket etickets.eticketcode=Ticket
etickets.placemap=Places on map etickets.placemap=Places on map
placegroup.showEticket=Show eticket placegroup.showEticket=Show eticket
mapView.enterQueue=Enter queue
mapView.check=Check own queuestatus
code/moya-web/src/main/resources/fi/codecrew/moya/resources/i18n_fi.properties
...@@ -1634,3 +1634,5 @@ etickets.placeinfo=Paikkatiedot ...@@ -1634,3 +1634,5 @@ etickets.placeinfo=Paikkatiedot
etickets.eticketcode=Lippu etickets.eticketcode=Lippu
etickets.placemap=Paikat kartalla etickets.placemap=Paikat kartalla
placegroup.showEticket=N\u00E4yt\u00E4 lippu placegroup.showEticket=N\u00E4yt\u00E4 lippu
mapView.enterQueue=Liity jonoon
mapView.check=P\u00E4ivit\u00E4 jonopaikka
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!