Skip to content

Codecrew / Moya

Go to a project
Commit 8fdb8ed2 by Tuomas Riihimäki
Options

Merge branch 'reserve_ui' into 'master' 

Ilmoitus kun lähtee poies sivulta

Ilimoitus kun lähtee pois varaussivulta, nyt enemmän selainystävällisenä.

(vanha tyyli toimi joissain selaimissa, mut nykyspeksin mukaan ei voida näyttää alerttia beforeunload -eventissä, vaan voidaan pelkästään palauttaa viesti, joka sitten näytetään käyttäjälle selaimen puolesta).

See merge request !175
2 parents dbd353de aeb5d833
Inline Side-by-side
Showing with 278 additions and 247 deletions
code/moya-beans/ejbModule/fi/codecrew/moya/facade/PlaceFacade.java
......@@ -117,6 +117,27 @@ public class PlaceFacade extends IntegerPkGenericFacade<Place> {
return q.getResultList();
}
public List<Place> findUsersUnlocketSelected(EventUser user) {
CriteriaBuilder cb = getEm().getCriteriaBuilder();
CriteriaQuery<Place> cq = cb.createQuery(Place.class);
Root<Place> root = cq.from(Place.class);
cq.select(root);
cq.where(
cb.and(
cb.equal(root.get(Place_.map).get(EventMap_.event), user.getEvent()),
cb.equal(root.get(Place_.currentUser), user),
cb.isNull(root.get(Place_.group))
));
TypedQuery<Place> q = getEm().createQuery(cq);
return q.getResultList();
}
public int setBuyable(EventMap map, String like, boolean b) {
CriteriaBuilder cb = getEm().getCriteriaBuilder();
CriteriaQuery<Place> cq = cb.createQuery(Place.class);
......
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"
xmlns:ui="http://java.sun.com/jsf/facelets"
xmlns:f="http://java.sun.com/jsf/core"
xmlns:h="http://java.sun.com/jsf/html"
xmlns:map="http://java.sun.com/jsf/composite/cditools/map"
xmlns:tools="http://java.sun.com/jsf/composite/cditools"
xmlns:c="http://java.sun.com/jsp/jstl/core"
xmlns:p="http://primefaces.org/ui">
xmlns:ui="http://java.sun.com/jsf/facelets"
xmlns:f="http://java.sun.com/jsf/core"
xmlns:h="http://java.sun.com/jsf/html"
xmlns:map="http://java.sun.com/jsf/composite/cditools/map"
xmlns:tools="http://java.sun.com/jsf/composite/cditools"
xmlns:c="http://java.sun.com/jsp/jstl/core"
xmlns:p="http://primefaces.org/ui">
<h:body>
<ui:composition template="#{sessionHandler.template}">
<f:metadata>
<f:event type="preRenderView"
listener="#{ajaxMapView.initReserveMap()}" />
</f:metadata>
<ui:param name="thispage" value="page.place.placemap" />
<ui:define name="content">
<h:form>
<p:remoteCommand name="updateWholePage" update="@all"
action="#{ajaxMapView.initReserveMap()}" />
</h:form>
<p:dialog rendered="#{ajaxMapView.isMgmtPermission()}"
visible="#{!empty ajaxMapView.place}" id="fbdiag">
Clicked place name : #{ajaxMapView.place.name};
<h:link rendered="#{!empty ajaxMapView.place}" outcome="/place/edit">
<f:param name="placeid" value="#{ajaxMapView.place.id}" />
Muokkaa
</h:link>
</p:dialog>
<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="seatmap.js" />
<h:outputStylesheet library="seatjs" name="placemap.css" />
<ui:fragment rendered="#{layoutView.manageContent}">
<h:link rendered="#{layoutView.manageContent}"
styleClass="editorlink" value="Edit content for users in queue"
outcome="/pages/manage">
<f:param name="pagename" value="#{layoutView.pagepath}:inqueue" />
</h:link>
<br />
<h:link rendered="#{layoutView.manageContent}"
styleClass="editorlink"
value="Edit content for user reserving places"
outcome="/pages/manage">
<f:param name="pagename" value="#{layoutView.pagepath}:reserving" />
</h:link>
<br />
</ui:fragment>
<ui:repeat var="cont1"
rendered="#{ajaxMapView.queueEnabled and ajaxMapView.reserving}"
value="#{menuView.getPagecontent('reserving')}">
<h:outputText value="#{cont1.content}" escape="false" />
</ui:repeat>
<ui:repeat var="cont1"
rendered="#{ajaxMapView.queueEnabled and not ajaxMapView.reserving}"
value="#{menuView.getPagecontent('inqueue')}">
<h:outputText value="#{cont1.content}" escape="false" />
</ui:repeat>
<br />
<h3>
<h:outputText value="#{i18n['mapView.yourPlaces']}" />
</h3>
<p:dataTable tableStyle="
width: auto;" var="cnt"
value="#{ajaxMapView.slotcount}">
<p:column headerText="#{i18n['mapView.productcount.productname']}">
<h:outputText value="#{cnt.product.name}" />
</p:column>
<p:column headerText="#{i18n['mapView.productcount.productcount']}">
<h:outputText value="#{cnt.count}" />
</p:column>
</p:dataTable>
<ui:fragment rendered="#{ajaxMapView.reserving}">
<div style="margin: 5px;">
<h:form id="placeselectform">
<p:commandButton rendered="#{ajaxMapView.canUserBuy()}"
value="#{i18n['mapView.buyPlaces']}"
action="#{ajaxMapView.buySelectedPlaces()}" ajax="false" />
</h:form>
</div>
</ui:fragment>
<ui:fragment
rendered="#{ajaxMapView.queueEnabled and not ajaxMapView.reserving}">
<h3><h:outputText value="#{i18n['mapView.youAreInQueue']}" /></h3>
<div style="margin: 1em;">
<h:outputText value="#{i18n['mapView.queuePosition']}: " />
<span id="queuepos" /><br />
<h:outputText value=" #{i18n['mapView.queuePositionUpdated']}: " />
<span id="queueupdated" /> <br />
</div>
</ui:fragment>
<svg id="seatmap" style="margin: auto; border: 1px solid black;"
width="#{ajaxMapView.map.width}px"
height="#{ajaxMapView.map.height}px" />
<script type="text/javascript">
// Queue is enabled and we are reserving.
var queueReserving = #{(ajaxMapView.queueEnabled and not ajaxMapView.reserving)?"true":"false"};
function updateMap() {
px.update();
reloadQueue();
}
function reloadQueue(){
if(queueReserving){
$.getJSON("#{request.contextPath}/rest/placemap/v1/queue/#{ajaxMapView.map.id}/#{ajaxMapView.eventuser.id}")
.done(function(data){
updateQueue(data);
} ).fail(function(){
location.reload();
});
}
}
function updateQueue(data) {
if(data === undefined) {
alert('not in queue');
return;
}
if(data.value == 0) {
updateWholePage();
} else {
$("#queuepos").text(data.value);
var d = new Date();
$("#queueupdated").text(d.getHours() + ":" + d.getMinutes() + ":"+ d.getSeconds())
}
}
setInterval(function () { updateMap() }, 5000);
var pageEscapeAlert = queueReserving;
$().ready(function(){
reloadQueue();
});
$(window).bind('beforeunload', function() {
if(pageEscapeAlert) {
alert("#{i18n['mapView.lockPlacesBeforeLeaving']}");
}
});
</script>
<script type="text/javascript">
px = placemap({
element : document.getElementById("seatmap"),
moyaurl : "#{request.contextPath}",
map_id : #{ajaxMapView.map.id},
placereserve: true,
onclick : function(d) {
// px.update();
//alert(d);
// #{ajaxMapView.isMgmtPermission()?'placeClicker([{name: \'placeId\', value: d}])':''}
return false;
}
});
// document.getElementById("editbutton").addEventListener("click",
// function() {
// px.enable_edit();
// });
//px.enable_edit();
</script>
<h:panelGrid columns="3" cellpadding="10">
<h:panelGrid columns="2">
<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']}" />
<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']}" />
<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']}" />
<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']}" />
<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:panelGrid>
<h:panelGrid columnClasses=",rightalign" columns="2">
<h:outputLabel value="#{i18n['placeSelect.totalPlaces']}:" />
<h:outputText value="#{ajaxMapView.availablePlaces}" />
<h:outputLabel value="#{i18n['placeSelect.placesleft']}:" />
<h:outputText value="#{ajaxMapView.placesLeftToSelect}" />
</h:panelGrid>
</h:panelGrid>
<ui:fragment rendered="#{ajaxMapView.reserving}">
<div style="margin: 5px;">
<h:form id="placeselectformBottom">
<p:commandButton rendered="#{ajaxMapView.canUserBuy()}"
value="#{i18n['mapView.buyPlaces']}"
action="#{ajaxMapView.buySelectedPlaces()}" ajax="false" />
</h:form>
</div>
</ui:fragment>
</ui:define>
</ui:composition>
<ui:composition template="#{sessionHandler.template}">
<f:metadata>
<f:event type="preRenderView" listener="#{ajaxMapView.initReserveMap()}"/>
</f:metadata>
<ui:param name="thispage" value="page.place.placemap"/>
<ui:define name="content">
<h:form>
<p:remoteCommand name="updateWholePage" update="@all" action="#{ajaxMapView.initReserveMap()}"/>
</h:form>
<p:dialog rendered="#{ajaxMapView.isMgmtPermission()}" visible="#{!empty ajaxMapView.place}" id="fbdiag">
Clicked place name : #{ajaxMapView.place.name};
<h:link rendered="#{!empty ajaxMapView.place}" outcome="/place/edit">
<f:param name="placeid" value="#{ajaxMapView.place.id}"/>
Muokkaa
</h:link>
</p:dialog>
<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="seatmap.js"/>
<h:outputStylesheet library="seatjs" name="placemap.css"/>
<ui:fragment rendered="#{layoutView.manageContent}">
<h:link rendered="#{layoutView.manageContent}" styleClass="editorlink" value="Edit content for users in queue" outcome="/pages/manage">
<f:param name="pagename" value="#{layoutView.pagepath}:inqueue"/>
</h:link>
<br/>
<h:link rendered="#{layoutView.manageContent}" styleClass="editorlink" value="Edit content for user reserving places" outcome="/pages/manage">
<f:param name="pagename" value="#{layoutView.pagepath}:reserving"/>
</h:link>
<br/>
</ui:fragment>
<ui:repeat var="cont1" rendered="#{ajaxMapView.queueEnabled and ajaxMapView.reserving}" value="#{menuView.getPagecontent('reserving')}">
<h:outputText value="#{cont1.content}" escape="false"/>
</ui:repeat>
<ui:repeat var="cont1" rendered="#{ajaxMapView.queueEnabled and not ajaxMapView.reserving}" value="#{menuView.getPagecontent('inqueue')}">
<h:outputText value="#{cont1.content}" escape="false"/>
</ui:repeat>
<br/>
<h3>
<h:outputText value="#{i18n['mapView.yourPlaces']}"/>
</h3>
<p:dataTable tableStyle=" width: auto;" var="cnt" value="#{ajaxMapView.slotcount}">
<p:column headerText="#{i18n['mapView.productcount.productname']}">
<h:outputText value="#{cnt.product.name}"/>
</p:column>
<p:column headerText="#{i18n['mapView.productcount.productcount']}">
<h:outputText value="#{cnt.count}"/>
</p:column>
</p:dataTable>
<ui:fragment rendered="#{ajaxMapView.reserving}">
<div style="margin: 5px;">
<h:form id="placeselectform">
<p:commandButton onclick="$(window).unbind('beforeunload');" rendered="#{ajaxMapView.canUserBuy()}" value="#{i18n['mapView.buyPlaces']}" actionListener="#{ajaxMapView.buySelectedPlaces()}" />
</h:form>
</div>
</ui:fragment>
<ui:fragment rendered="#{ajaxMapView.queueEnabled and not ajaxMapView.reserving}">
<h3><h:outputText value="#{i18n['mapView.youAreInQueue']}"/></h3>
<div style="margin: 1em;">
<h:outputText value="#{i18n['mapView.queuePosition']}: "/>
<span id="queuepos"/><br/>
<h:outputText value=" #{i18n['mapView.queuePositionUpdated']}: "/>
<span id="queueupdated"/> <br/>
</div>
</ui:fragment>
<svg id="seatmap" style="margin: auto; border: 1px solid black;" width="#{ajaxMapView.map.width}px" height="#{ajaxMapView.map.height}px"/>
<script type="text/javascript">
// Queue is enabled and we are reserving.
var queueReserving = #{(ajaxMapView.queueEnabled and not ajaxMapView.reserving)?"true":"false"};
function updateMap() {
px.update();
reloadQueue();
}
function reloadQueue() {
if (queueReserving) {
$.getJSON("#{request.contextPath}/rest/placemap/v1/queue/#{ajaxMapView.map.id}/#{ajaxMapView.eventuser.id}")
.done(function (data) {
updateQueue(data);
}).fail(function () {
location.reload();
});
}
}
function updateQueue(data) {
if (data === undefined) {
alert('not in queue');
return;
}
if (data.value == 0) {
updateWholePage();
} else {
$("#queuepos").text(data.value);
var d = new Date();
$("#queueupdated").text(d.getHours() + ":" + d.getMinutes() + ":" + d.getSeconds())
}
}
setInterval(function () {
updateMap()
}, 5000);
var pageEscapeAlert = queueReserving;
$().ready(function () {
reloadQueue();
});
</script>
<script type="text/javascript">
px = placemap({
element: document.getElementById("seatmap"),
moyaurl: "#{request.contextPath}",
map_id: #{ajaxMapView.map.id},
placereserve: true,
onclick: function (d) {
// px.update();
//alert(d);
// #{ajaxMapView.isMgmtPermission()?'placeClicker([{name: \'placeId\', value: d}])':''}
return false;
}
});
// document.getElementById("editbutton").addEventListener("click",
// function() {
// px.enable_edit();
// });
//px.enable_edit();
</script>
<h:panelGrid columns="3" cellpadding="10">
<h:panelGrid columns="2">
<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']}"/>
<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']}"/>
<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']}"/>
<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']}"/>
<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:panelGrid>
<h:panelGrid columnClasses=",rightalign" columns="2">
<h:outputLabel value="#{i18n['placeSelect.totalPlaces']}:"/>
<h:outputText value="#{ajaxMapView.availablePlaces}"/>
<h:outputLabel value="#{i18n['placeSelect.placesleft']}:"/>
<h:outputText value="#{ajaxMapView.placesLeftToSelect}"/>
</h:panelGrid>
</h:panelGrid>
<ui:fragment rendered="#{ajaxMapView.reserving}">
<div style="margin: 5px;">
<h:form id="placeselectformBottom">
<p:commandButton onclick="$(window).unbind('beforeunload');" rendered="#{ajaxMapView.canUserBuy()}" value="#{i18n['mapView.buyPlaces']}" actionListener="#{ajaxMapView.buySelectedPlaces()}"/>
</h:form>
</div>
</ui:fragment>
</ui:define>
</ui:composition>
</h:body>
</html>
\ No newline at end of file
code/moya-web/WebContent/resources/seatjs/seatmap.js
......@@ -57,14 +57,19 @@ function placemap(opts)
cannot_reserve: "Ei voitu varata paikkaa",
cannot_release: "Ei voitu vapauttaa paikkaa",
success_reserve: "Varattu paikka",
success_release: "Vapautettu paikka"
success_release: "Vapautettu paikka",
leavemessage: "Et ole lukinnut paikkojasi, oletko varma että haluat poistua?"
};
px.locales['en'] = {
cannot_reserve: "Can't reserve place",
cannot_release: "Can't release place",
success_reserve: "Place reserved",
success_release: "Place released"
success_release: "Place released",
leavemessage: "Forgot to lock your places, are you sure you want to leave?"
};
px.is_leave_message_on = false;
px.selected_count = 0;
var guide_layer = px.element.append("g").attr("id", "guides");
......@@ -239,6 +244,8 @@ function placemap(opts)
//px.onclick(data);
px.toggle_place(data);
//px.update_place(data.id);
......@@ -257,6 +264,25 @@ function placemap(opts)
}*/
}
px.update_leavemessage = function() {
if(px.is_leave_message_on) {
if(px.selected_count <= 0) {
px.selected_count = 0;
px.is_leave_message_on = false
$(window).unbind('beforeunload');
}
} else {
if(px.selected_count > 0) {
$(window).bind('beforeunload', function () {
return px.locales[px.locale].leavemessage;
});
px.is_leave_message_on = true;
}
}
}
function place_color(d, i)
{
if (Object.keys(px.place_colors).indexOf(d.state) != -1) return px.place_colors[d.state];
......@@ -285,6 +311,7 @@ function placemap(opts)
.style('stroke', '#101010')
.style('stroke-width', '1')
.append("title", function(d, i) { return d.name; });
places
.attr("x", function(d, i) { return d.x; })
.attr("y", function(d, i) { return d.y; })
......@@ -395,25 +422,28 @@ function placemap(opts)
console.log(data.places[0]);
if (data.places[0].state == place.state)
{
if ( place.state == "F") PF("g").show([{"summary":px.locales[px.locale].cannot_reserve,
if ( place.state == "F") PF("messages_growl").show([{"summary":px.locales[px.locale].cannot_reserve,
"detail":"",
"severity":"warn"}]);
if ( place.state == "T") PF("g").show([{"summary":px.locales[px.locale].cannot_release,
if ( place.state == "T") PF("messages_growl").show([{"summary":px.locales[px.locale].cannot_release,
"detail":"",
"severity":"warn"}]);
}
else if (data.places[0].state == "T")
{
PF("g").show([{"summary":px.locales[px.locale].success_reserve,
"detail":"",
"severity":"info"}]);
// tän korjaus sotki ehkä jotain, otetaan poies
//PF("messages_growl").show([{"summary":px.locales[px.locale].success_reserve, "detail":"", "severity":"info"}]);
px.selected_count++;
}
else if (data.places[0].state == "F")
{
PF("g").show([{"summary":px.locales[px.locale].success_release,
"detail":"",
"severity":"info"}]);
else if (data.places[0].state == "F") {
//PF("messages_growl").show([{"summary":px.locales[px.locale].success_release, "detail":"", "severity":"info"}]);
if (px.selected_count > 0) {
px.selected_count--;
} else {
px.selected_count = 0;
}
}
px.update_leavemessage();
}
);
}
......
code/moya-web/WebContent/resources/templates/primelayout/template.xhtml
......@@ -188,7 +188,7 @@
<p:menubar rendered="#{primeMenuView.hasSecondaryMenu}" model="#{primeMenuView.secondaryMenuModel}" />
<h:form id="messages">
<p:growl id="growl" showDetail="true" />
<p:growl id="growl" showDetail="true" widgetVar="messages_growl" />
</h:form>
......
code/moya-web/src/main/java/fi/codecrew/moya/web/cdiview/map/AjaxMapView.java
......@@ -211,16 +211,17 @@ public class AjaxMapView extends GenericCDIView {
return userview.getSelectedUser();
}
public String buySelectedPlaces() {
public void buySelectedPlaces() {
try {
EventUser user = userview.getSelectedUser();
placebean.buySelectedPlaces(user);
quebean.remove(initMap(), user);
return "/place/myGroups";
// return "/place/myGroups";
super.navihandler.forward("/place/myGroups?faces-redirect=true");
} catch (BortalCatchableException e) {
addFaceMessage("mapView.errorWhileBuyingPlaces");
}
return null;
}
public boolean isMgmtPermission()
......
code/moya-web/src/main/resources/fi/codecrew/moya/resources/i18n.properties
......@@ -469,3 +469,4 @@ usercart.showoverview = Vie tarkastusn\u00E4kym\u00E4\u00E4n
viewlectures.title = Kurssit ja luennot
yes = Kyll\u00E4
placeslot.state.expired=Vanhentunut
code/moya-web/src/main/resources/fi/codecrew/moya/resources/i18n_en.properties
......@@ -1677,3 +1677,4 @@ voting.create.voteEnd = Voting close
voting.create.voteStart = Voting start
yes = Yes
placeslot.state.expired=Expired
code/moya-web/src/main/resources/fi/codecrew/moya/resources/i18n_fi.properties
......@@ -1659,3 +1659,4 @@ voting.create.voteEnd = \u00C4\u00E4nestys kiinni
voting.create.voteStart = \u00C4\u00E4nestys auki
yes = Kyll\u00E4
placeslot.state.expired=Vanhentunut
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!