Skip to content

Codecrew / Moya

Go to a project
Commit 54a1900d by Tuukka Kivilahti
Options

reformat

1 parent dbd353de
Inline Side-by-side
Showing with 70 additions and 68 deletions
code/moya-web/WebContent/neomap/reserve.xhtml
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" <html xmlns="http://www.w3.org/1999/xhtml"
xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:ui="http://java.sun.com/jsf/facelets"
xmlns:f="http://java.sun.com/jsf/core" xmlns:f="http://java.sun.com/jsf/core"
...@@ -14,63 +15,62 @@ ...@@ -14,63 +15,62 @@
<ui:composition template="#{sessionHandler.template}"> <ui:composition template="#{sessionHandler.template}">
<f:metadata> <f:metadata>
<f:event type="preRenderView" <f:event type="preRenderView"
listener="#{ajaxMapView.initReserveMap()}" /> listener="#{ajaxMapView.initReserveMap()}"/>
</f:metadata> </f:metadata>
<ui:param name="thispage" value="page.place.placemap" /> <ui:param name="thispage" value="page.place.placemap"/>
<ui:define name="content"> <ui:define name="content">
<h:form> <h:form>
<p:remoteCommand name="updateWholePage" update="@all" <p:remoteCommand name="updateWholePage" update="@all"
action="#{ajaxMapView.initReserveMap()}" /> action="#{ajaxMapView.initReserveMap()}"/>
</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}"/>
Muokkaa Muokkaa
</h:link> </h:link>
</p:dialog> </p:dialog>
<h:outputScript target="head" library="seatjs" name="d3.min.js" /> <h:outputScript target="head" library="seatjs" name="d3.min.js"/>
<h:outputScript target="head" library="seatjs" name="d3-tip.js" /> <h:outputScript target="head" library="seatjs" name="d3-tip.js"/>
<h:outputScript target="head" library="seatjs" name="seatmap.js" /> <h:outputScript target="head" library="seatjs" name="seatmap.js"/>
<h:outputStylesheet library="seatjs" name="placemap.css" /> <h:outputStylesheet library="seatjs" name="placemap.css"/>
<ui:fragment rendered="#{layoutView.manageContent}"> <ui:fragment rendered="#{layoutView.manageContent}">
<h:link rendered="#{layoutView.manageContent}" <h:link rendered="#{layoutView.manageContent}"
styleClass="editorlink" value="Edit content for users in queue" styleClass="editorlink" value="Edit content for users in queue"
outcome="/pages/manage"> outcome="/pages/manage">
<f:param name="pagename" value="#{layoutView.pagepath}:inqueue" /> <f:param name="pagename" value="#{layoutView.pagepath}:inqueue"/>
</h:link> </h:link>
<br /> <br/>
<h:link rendered="#{layoutView.manageContent}" <h:link rendered="#{layoutView.manageContent}"
styleClass="editorlink" styleClass="editorlink"
value="Edit content for user reserving places" value="Edit content for user reserving places"
outcome="/pages/manage"> outcome="/pages/manage">
<f:param name="pagename" value="#{layoutView.pagepath}:reserving" /> <f:param name="pagename" value="#{layoutView.pagepath}:reserving"/>
</h:link> </h:link>
<br /> <br/>
</ui:fragment> </ui:fragment>
<ui:repeat var="cont1" <ui:repeat var="cont1"
rendered="#{ajaxMapView.queueEnabled and ajaxMapView.reserving}" rendered="#{ajaxMapView.queueEnabled and ajaxMapView.reserving}"
value="#{menuView.getPagecontent('reserving')}"> value="#{menuView.getPagecontent('reserving')}">
<h:outputText value="#{cont1.content}" escape="false" /> <h:outputText value="#{cont1.content}" escape="false"/>
</ui:repeat> </ui:repeat>
<ui:repeat var="cont1" <ui:repeat var="cont1"
rendered="#{ajaxMapView.queueEnabled and not ajaxMapView.reserving}" rendered="#{ajaxMapView.queueEnabled and not ajaxMapView.reserving}"
value="#{menuView.getPagecontent('inqueue')}"> value="#{menuView.getPagecontent('inqueue')}">
<h:outputText value="#{cont1.content}" escape="false" /> <h:outputText value="#{cont1.content}" escape="false"/>
</ui:repeat> </ui:repeat>
<br /> <br/>
<h3> <h3>
<h:outputText value="#{i18n['mapView.yourPlaces']}" /> <h:outputText value="#{i18n['mapView.yourPlaces']}"/>
</h3> </h3>
<p:dataTable tableStyle=" <p:dataTable tableStyle="
...@@ -78,10 +78,10 @@ ...@@ -78,10 +78,10 @@
value="#{ajaxMapView.slotcount}"> value="#{ajaxMapView.slotcount}">
<p:column headerText="#{i18n['mapView.productcount.productname']}"> <p:column headerText="#{i18n['mapView.productcount.productname']}">
<h:outputText value="#{cnt.product.name}" /> <h:outputText value="#{cnt.product.name}"/>
</p:column> </p:column>
<p:column headerText="#{i18n['mapView.productcount.productcount']}"> <p:column headerText="#{i18n['mapView.productcount.productcount']}">
<h:outputText value="#{cnt.count}" /> <h:outputText value="#{cnt.count}"/>
</p:column> </p:column>
</p:dataTable> </p:dataTable>
<ui:fragment rendered="#{ajaxMapView.reserving}"> <ui:fragment rendered="#{ajaxMapView.reserving}">
...@@ -89,28 +89,28 @@ ...@@ -89,28 +89,28 @@
<h:form id="placeselectform"> <h:form id="placeselectform">
<p:commandButton rendered="#{ajaxMapView.canUserBuy()}" <p:commandButton rendered="#{ajaxMapView.canUserBuy()}"
value="#{i18n['mapView.buyPlaces']}" value="#{i18n['mapView.buyPlaces']}"
action="#{ajaxMapView.buySelectedPlaces()}" ajax="false" /> action="#{ajaxMapView.buySelectedPlaces()}" ajax="false"/>
</h:form> </h:form>
</div> </div>
</ui:fragment> </ui:fragment>
<ui:fragment <ui:fragment
rendered="#{ajaxMapView.queueEnabled and not ajaxMapView.reserving}"> rendered="#{ajaxMapView.queueEnabled and not ajaxMapView.reserving}">
<h3><h:outputText value="#{i18n['mapView.youAreInQueue']}" /></h3> <h3><h:outputText value="#{i18n['mapView.youAreInQueue']}"/></h3>
<div style="margin: 1em;"> <div style="margin: 1em;">
<h:outputText value="#{i18n['mapView.queuePosition']}: " /> <h:outputText value="#{i18n['mapView.queuePosition']}: "/>
<span id="queuepos" /><br /> <span id="queuepos"/><br/>
<h:outputText value=" #{i18n['mapView.queuePositionUpdated']}: " /> <h:outputText value=" #{i18n['mapView.queuePositionUpdated']}: "/>
<span id="queueupdated" /> <br /> <span id="queueupdated"/> <br/>
</div> </div>
</ui:fragment> </ui:fragment>
<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" width="#{ajaxMapView.map.width}px"
height="#{ajaxMapView.map.height}px" /> height="#{ajaxMapView.map.height}px"/>
<script type="text/javascript"> <script type="text/javascript">
...@@ -124,12 +124,12 @@ ...@@ -124,12 +124,12 @@
} }
function reloadQueue(){ function reloadQueue() {
if(queueReserving){ if (queueReserving) {
$.getJSON("#{request.contextPath}/rest/placemap/v1/queue/#{ajaxMapView.map.id}/#{ajaxMapView.eventuser.id}") $.getJSON("#{request.contextPath}/rest/placemap/v1/queue/#{ajaxMapView.map.id}/#{ajaxMapView.eventuser.id}")
.done(function(data){ .done(function (data) {
updateQueue(data); updateQueue(data);
} ).fail(function(){ }).fail(function () {
location.reload(); location.reload();
}); });
} }
...@@ -137,30 +137,34 @@ ...@@ -137,30 +137,34 @@
function updateQueue(data) { function updateQueue(data) {
if(data === undefined) { if (data === undefined) {
alert('not in queue'); alert('not in queue');
return; return;
} }
if(data.value == 0) { if (data.value == 0) {
updateWholePage(); updateWholePage();
} else { } else {
$("#queuepos").text(data.value); $("#queuepos").text(data.value);
var d = new Date(); var d = new Date();
$("#queueupdated").text(d.getHours() + ":" + d.getMinutes() + ":"+ d.getSeconds()) $("#queueupdated").text(d.getHours() + ":" + d.getMinutes() + ":" + d.getSeconds())
} }
} }
setInterval(function () { updateMap() }, 5000); setInterval(function () {
updateMap()
}, 5000);
var pageEscapeAlert = queueReserving; var pageEscapeAlert = queueReserving;
$().ready(function(){ $().ready(function () {
reloadQueue(); reloadQueue();
}); });
$(window).bind('beforeunload', function() {
if(pageEscapeAlert) { // You cannot do alert or stuff before unloading, you can just return message what will be shown to user "are you sure you want to leave"
$(window).bind('beforeunload', function () {
if (pageEscapeAlert) {
alert("#{i18n['mapView.lockPlacesBeforeLeaving']}"); alert("#{i18n['mapView.lockPlacesBeforeLeaving']}");
} }
}); });
...@@ -171,21 +175,20 @@ ...@@ -171,21 +175,20 @@
<script type="text/javascript"> <script type="text/javascript">
px = placemap({ px = placemap({
element : document.getElementById("seatmap"), element: document.getElementById("seatmap"),
moyaurl : "#{request.contextPath}", moyaurl: "#{request.contextPath}",
map_id : #{ajaxMapView.map.id}, map_id: #{ajaxMapView.map.id},
placereserve: true, placereserve: true,
onclick : function(d) { onclick: function (d) {
// px.update(); // px.update();
//alert(d); //alert(d);
// #{ajaxMapView.isMgmtPermission()?'placeClicker([{name: \'placeId\', value: d}])':''} // #{ajaxMapView.isMgmtPermission()?'placeClicker([{name: \'placeId\', value: d}])':''}
return false; return false;
} }
}); });
// document.getElementById("editbutton").addEventListener("click", // document.getElementById("editbutton").addEventListener("click",
// function() { // function() {
// px.enable_edit(); // px.enable_edit();
// }); // });
//px.enable_edit(); //px.enable_edit();
...@@ -194,29 +197,28 @@ ...@@ -194,29 +197,28 @@
<h:panelGrid columns="3" cellpadding="10"> <h:panelGrid columns="3" cellpadding="10">
<h:panelGrid columns="2"> <h:panelGrid columns="2">
<div <div style="border-color: black; border-style: solid; border-width: 1px; background-color: rgb(83, 83, 83); width: 10px; height: 10px;">&nbsp;</div>
style="border-color: black; border-style: solid; border-width: 1px; background-color: rgb(83, 83, 83); width: 10px; height: 10px;">&nbsp;</div> <h:outputText value="#{i18n['placeSelect.legend.grey']}"/>
<h:outputText value="#{i18n['placeSelect.legend.grey']}" />
<div <div style="border-color: black; border-style: solid; border-width: 1px; background-color: rgb(204, 204, 204); width: 10px; height: 10px;">&nbsp;</div>
style="border-color: black; border-style: solid; border-width: 1px; background-color: rgb(204, 204, 204); width: 10px; height: 10px;">&nbsp;</div> <h:outputText value="#{i18n['placeSelect.legend.white']}"/>
<h:outputText value="#{i18n['placeSelect.legend.white']}" />
<div <div style="border-color: black; border-style: solid; border-width: 1px; background-color: rgb(180, 1, 0); width: 10px; height: 10px;">&nbsp;</div>
style="border-color: black; border-style: solid; border-width: 1px; background-color: rgb(180, 1, 0); width: 10px; height: 10px;">&nbsp;</div> <h:outputText value="#{i18n['placeSelect.legend.red']}"/>
<h:outputText value="#{i18n['placeSelect.legend.red']}" />
<div <div style="border-color: black; border-style: solid; border-width: 1px; background-color: rgb(47, 165, 37); width: 10px; height: 10px;">&nbsp;</div>
style="border-color: black; border-style: solid; border-width: 1px; background-color: rgb(47, 165, 37); width: 10px; height: 10px;">&nbsp;</div> <h:outputText value="#{i18n['placeSelect.legend.green']}"/>
<h:outputText value="#{i18n['placeSelect.legend.green']}" />
<div <div style="border-color: black; border-style: solid; border-width: 1px; background-color: rgb(67, 66, 193); width: 10px; height: 10px;">&nbsp;</div>
style="border-color: black; border-style: solid; border-width: 1px; background-color: rgb(67, 66, 193); width: 10px; height: 10px;">&nbsp;</div> <h:outputText value="#{i18n['placeSelect.legend.blue']}"/>
<h:outputText value="#{i18n['placeSelect.legend.blue']}" />
</h:panelGrid> </h:panelGrid>
<h:panelGrid columnClasses=",rightalign" columns="2"> <h:panelGrid columnClasses=",rightalign" columns="2">
<h:outputLabel value="#{i18n['placeSelect.totalPlaces']}:" /> <h:outputLabel value="#{i18n['placeSelect.totalPlaces']}:"/>
<h:outputText value="#{ajaxMapView.availablePlaces}" /> <h:outputText value="#{ajaxMapView.availablePlaces}"/>
<h:outputLabel value="#{i18n['placeSelect.placesleft']}:" /> <h:outputLabel value="#{i18n['placeSelect.placesleft']}:"/>
<h:outputText value="#{ajaxMapView.placesLeftToSelect}" /> <h:outputText value="#{ajaxMapView.placesLeftToSelect}"/>
</h:panelGrid> </h:panelGrid>
...@@ -228,7 +230,7 @@ ...@@ -228,7 +230,7 @@
<h:form id="placeselectformBottom"> <h:form id="placeselectformBottom">
<p:commandButton rendered="#{ajaxMapView.canUserBuy()}" <p:commandButton rendered="#{ajaxMapView.canUserBuy()}"
value="#{i18n['mapView.buyPlaces']}" value="#{i18n['mapView.buyPlaces']}"
action="#{ajaxMapView.buySelectedPlaces()}" ajax="false" /> action="#{ajaxMapView.buySelectedPlaces()}" ajax="false"/>
</h:form> </h:form>
</div> </div>
</ui:fragment> </ui:fragment>
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!