Skip to content

Codecrew / Moya

Go to a project
Commit 2f24b40c by Tuukka Kivilahti
Options

Merge branch 'que2' into 'master' 

Map queue

Fairly finalized version of the placequeue

See merge request !158
2 parents 17e0fb65 ba2bf449
Inline Side-by-side
Showing with 619 additions and 264 deletions
code/moya-beans-client/ejbModule/fi/codecrew/moya/beans/PlaceBeanLocal.java
......@@ -122,4 +122,6 @@ public interface PlaceBeanLocal {
List<Place> findPlacePrintlistForUser(EventUser user);
List<PlaceSlot> getFreePlaceslots(EventUser u, EventMap map);
}
code/moya-beans/ejbModule/fi/codecrew/moya/beans/MenuBean.java
......@@ -133,10 +133,11 @@ public class MenuBean implements MenuBeanLocal {
userEvent.addPage(menuitemfacade.findOrCreate("/user/invite"), UserPermission.INVITE_USERS);
userEvent.addPage(menuitemfacade.findOrCreate("/feedback/index"), UserPermission.VITUTTAAKO);
MenuNavigation userkauppa = usermenu.addPage(null, null);
userkauppa.setKey("topnavi.usershop");
userkauppa.addPage(menuitemfacade.findOrCreate("/shop/createBill"), BillPermission.CREATE_BILL);
userkauppa.addPage(menuitemfacade.findOrCreate("/neomap/view"), MapPermission.BUY_PLACES);
userkauppa.addPage(menuitemfacade.findOrCreate("/neomap/reserve"), MapPermission.BUY_PLACES);
userkauppa.addPage(menuitemfacade.findOrCreate("/foodwave/list"), ShopPermission.SHOP_FOODWAVE);
userkauppa.addPage(menuitemfacade.findOrCreate("/foodwave/listProducts"), ShopPermission.SHOP_FOODWAVE).setVisible(false);
userkauppa.addPage(menuitemfacade.findOrCreate("/foodwave/ThanksForOrderingFromCounter"), ShopPermission.SHOP_FOODWAVE).setVisible(false);
......@@ -151,7 +152,7 @@ public class MenuBean implements MenuBeanLocal {
userPlaces.setKey("topnavi.userplaces");
userPlaces.addPage(menuitemfacade.findOrCreate("/place/myGroups"), MapPermission.BUY_PLACES);
userPlaces.addPage(menuitemfacade.findOrCreate("/place/viewplacemap"), MapPermission.VIEW);
userPlaces.addPage(menuitemfacade.findOrCreate("/neomap/view"), MapPermission.VIEW);
userPlaces.addPage(menuitemfacade.findOrCreate("/place/myEtickets"), MapPermission.BUY_PLACES).setVisible(false);
userPlaces.addPage(menuitemfacade.findOrCreate("/place/edit"), MapPermission.MANAGE_OTHERS).setVisible(false);
userPlaces.addPage(menuitemfacade.findOrCreate("/place/eticketStandalone"), UserPermission.ANYUSER).setVisible(false);
......
code/moya-beans/ejbModule/fi/codecrew/moya/beans/PlaceBean.java
......@@ -48,8 +48,10 @@ import javax.ejb.Stateless;
import javax.ejb.Timeout;
import javax.ejb.Timer;
import javax.ejb.TimerService;
import javax.xml.registry.infomodel.Slot;
import fi.codecrew.moya.model.*;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
......@@ -246,7 +248,7 @@ public class PlaceBean implements PlaceBeanLocal {
return false;
}
} else {
List<PlaceSlot> slots = placeSlotFacade.findFreePlaceSlots(user, place.getProduct());
List<PlaceSlot> slots = placeSlotFacade.findFreePlaceSlotsForProduct(user, place.getProduct());
logger.info("Found free slots {} for user {}", Arrays.asList(slots.toArray()), user);
if (slots != null && !slots.isEmpty()) {
PlaceSlot slot = slots.get(0);
......@@ -746,7 +748,7 @@ public class PlaceBean implements PlaceBeanLocal {
if (!permbean.isCurrentUser(user) && !permbean.hasPermission(MapPermission.MANAGE_OTHERS))
throw new EJBAccessException("User " + permbean.getCurrentUser() + "tried to fetch free places for user " + user);
return placeSlotFacade.findFreePlaceSlots(user, product);
return placeSlotFacade.findFreePlaceSlotsForProduct(user, product);
}
@Override
......@@ -783,4 +785,13 @@ public class PlaceBean implements PlaceBeanLocal {
return placeFacade.getMapProducts(map);
}
@Override
public List<PlaceSlot> getFreePlaceslots(EventUser user, EventMap map) {
user = eventUserFacade.reload(user);
if (!permbean.isCurrentUser(user) && !permbean.hasPermission(MapPermission.MANAGE_OTHERS))
throw new EJBAccessException("User " + permbean.getCurrentUser() + "tried to fetch free places for user " + user);
return placeSlotFacade.findFreePlaceSlots(user, map);
}
}
code/moya-beans/ejbModule/fi/codecrew/moya/beans/QueueBean.java
......@@ -47,7 +47,7 @@ public class QueueBean implements QueueBeanLocal {
private final Map<Integer, MapQueue> mapqueues;
private int reservingSize = 2;
private int reservingSize = 1;
private class MapQueue {
// private final Set<MapReservationQueueEntry> reserving = new HashSet<>();
......@@ -94,6 +94,16 @@ public class QueueBean implements QueueBeanLocal {
public boolean isReserving(EventUser e) {
// Check queue size and add entry to queue
checkReservingEntry();
MapReservationQueueEntry que = queEntries.get(e);
if (que != null) {
que.setSeenTime(new Date());
}
return reserving.contains(e);
}
private void checkReservingEntry() {
if (reserving.size() < reservingSize) {
synchronized (queue) {
if (reserving.size() < reservingSize) {
......@@ -104,12 +114,6 @@ public class QueueBean implements QueueBeanLocal {
}
}
}
MapReservationQueueEntry que = queEntries.get(e);
if (que != null) {
que.setSeenTime(new Date());
}
return reserving.contains(e);
}
public MapReservationQueueEntry remove(EventUser user)
......@@ -124,6 +128,7 @@ public class QueueBean implements QueueBeanLocal {
logger.info("Removed user {} from queue");
}
ret = queEntries.remove(user);
checkReservingEntry();
}
return ret;
}
......@@ -132,10 +137,16 @@ public class QueueBean implements QueueBeanLocal {
MapReservationQueueEntry ret = null;
synchronized (queue) {
if (!reserving.contains(user) && !queue.contains(user)) {
ret = new MapReservationQueueEntry();
queEntries.put(user, ret);
boolean queStat = queue.offer(user);
logger.info("User {} not in queue, offer state {}", user, queStat);
if (reserving.size() < reservingSize) {
boolean resStat = reserving.add(user);
logger.info("User {} not in queue and reserving smaller than size Entering directly: Success: {}", user, resStat);
} else {
boolean queStat = queue.offer(user);
logger.info("User {} not in queue, offer state {}", user, queStat);
}
} else {
ret = queEntries.get(user);
logger.info("User {} already in queue. Not entering again {}", user, ret);
......@@ -276,7 +287,7 @@ public class QueueBean implements QueueBeanLocal {
logger.info("User {} already in queue");
ret = queue.getEntry(user);
} else {
List<PlaceSlot> slots = slotfacade.findFreePlaceSlots(user, null);
List<PlaceSlot> slots = slotfacade.findFreePlaceSlotsForProduct(user, null);
logger.info("User {} not yet in queue. User has {} slots", user, slots.size());
if (!slots.isEmpty()) {
ret = queue.enter(user);
......@@ -286,4 +297,7 @@ public class QueueBean implements QueueBeanLocal {
return ret;
}
}
code/moya-beans/ejbModule/fi/codecrew/moya/facade/PlaceSlotFacade.java
......@@ -30,6 +30,7 @@ import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
import javax.persistence.criteria.Root;
import javax.persistence.criteria.Subquery;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
......@@ -37,11 +38,15 @@ import org.slf4j.LoggerFactory;
import fi.codecrew.moya.beans.EventBeanLocal;
import fi.codecrew.moya.model.Bill;
import fi.codecrew.moya.model.Bill_;
import fi.codecrew.moya.model.EventMap;
import fi.codecrew.moya.model.EventMap_;
import fi.codecrew.moya.model.EventUser;
import fi.codecrew.moya.model.Place;
import fi.codecrew.moya.model.PlaceSlot;
import fi.codecrew.moya.model.PlaceSlot_;
import fi.codecrew.moya.model.Place_;
import fi.codecrew.moya.model.Product;
import fi.codecrew.moya.model.Product_;
@Stateless
@LocalBean
......@@ -64,7 +69,7 @@ public class PlaceSlotFacade extends IntegerPkGenericFacade<PlaceSlot> {
* @param product
* @return
*/
public List<PlaceSlot> findFreePlaceSlots(EventUser user, Product product) {
public List<PlaceSlot> findFreePlaceSlotsForProduct(EventUser user, Product product) {
CriteriaBuilder cb = getEm().getCriteriaBuilder();
CriteriaQuery<PlaceSlot> q = cb.createQuery(PlaceSlot.class);
Root<PlaceSlot> root = q.from(PlaceSlot.class);
......@@ -133,4 +138,27 @@ public class PlaceSlotFacade extends IntegerPkGenericFacade<PlaceSlot> {
Long count = super.getSingleNullableResult(getEm().createQuery(q));
return count;
}
public List<PlaceSlot> findFreePlaceSlots(EventUser user, EventMap map) {
CriteriaBuilder cb = getEm().getCriteriaBuilder();
CriteriaQuery<PlaceSlot> q = cb.createQuery(PlaceSlot.class);
Root<PlaceSlot> root = q.from(PlaceSlot.class);
Path<Bill> bill = root.get(PlaceSlot_.bill);
final List<Predicate> preds = new ArrayList<>();
preds.add(cb.equal(bill.get(Bill_.user), user));
preds.add(cb.isNotNull(bill.get(Bill_.paidDate)));
preds.add(cb.isNull(root.get(PlaceSlot_.used)));
Subquery<Integer> mapProdq = q.subquery(Integer.class);
Root<EventMap> mapProdqRoot = mapProdq.from(EventMap.class);
mapProdq.select(mapProdqRoot.join(EventMap_.places).get(Place_.product).get(Product_.id));
mapProdq.where(cb.equal(mapProdqRoot, map));
mapProdq.distinct(true);
preds.add(root.get(PlaceSlot_.product).get(Product_.id).in(mapProdq));
q.where(preds.toArray(new Predicate[preds.size()]));
return getEm().createQuery(q).getResultList();
}
}
code/moya-web/WebContent/neomap/reserve.xhtml
......@@ -3,6 +3,7 @@
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">
......@@ -15,13 +16,14 @@
<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="placeClicker" update=":fbdiag"
action="#{ajaxMapView.placeClicked()}" />
<p:remoteCommand name="updateWholePage" update="@all"
action="#{ajaxMapView.initReserveMap()}" />
</h:form>
<p:dialog visible="#{!empty ajaxMapView.place}" id="fbdiag">
<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}" />
......@@ -33,29 +35,203 @@
<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" />
<h:form>
<h:commandButton rendered="#{mapView.canUserBuy()}"
value="#{i18n['mapView.buyPlaces']}"
action="#{placeView.buySelectedPlaces()}" />
</h:form>
<div>
<svg id="seatmap"
style="margin: auto; border: 1px solid black; background-image: url()"
width="#{ajaxMapView.map.width}px"
height="#{ajaxMapView.map.height}px" />
<script type="text/javascript">
px = placemap({
<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) {
// placeClicker([{name: 'placeId', value: 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>
</div>
<h:panelGrid columns="3" cellpadding="10">
<h:panelGrid columns="2">
<div
style="border-color: black; border-style: solid; border-width: 1px; background-color: grey; 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: white; 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: red; 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: green; 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: blue; 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>
</h:body>
......
code/moya-web/WebContent/neomap/view.xhtml
......@@ -21,8 +21,9 @@
<p:remoteCommand name="placeClicker" update=":fbdiag"
action="#{ajaxMapView.placeClicked()}" />
</h:form>
-->
<p:dialog rendered="#{ajaxMapView.isMgmtPermission()}" visible="#{!empty ajaxMapView.place}" id="fbdiag">
-->
<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}" />
......@@ -35,33 +36,32 @@
<h:outputScript target="head" library="seatjs" name="seatmap.js" />
<h:outputStylesheet library="seatjs" name="placemap.css" />
<ui:fragment rendered="#{not ajaxMapView.queueEnabled}">
<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>
<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>
<p:outputPanel rendered="#{ajaxMapView.queueEnabled}">
<h:form>
<p:commandButton value="#{i18n['mapView.enterQueue']}" action="#{ajaxMapView.enterQueue()}" ajax="false" />
<p:commandButton value="#{i18n['mapView.check']}" action="#{ajaxMapView.checkReserving()}" />
</h:form>
queueEntry #{ajaxMapView.queueEntry} <br />
QueuePosition: #{ajaxMapView.queuePosition} <br />
Available places to select: #{ajaxMapView.placesLeftToSelect} <br />
isReserving #{ajaxMapView.reserving} <br />
</p:outputPanel>
<button onclick="px.update()">#{i18n['neomap.updateMap']}</button>
<br />
<svg id="seatmap" style="margin: auto; border: 1px solid black;" width="#{ajaxMapView.map.width}px" height="#{ajaxMapView.map.height}px" />
<svg id="seatmap" style="margin: auto; border: 1px solid black;"
width="#{ajaxMapView.map.width}px"
height="#{ajaxMapView.map.height}px" />
<script type="text/javascript">
px = placemap({
// If queue is enabled, do not allow clicking of places.
px = placemap({
element : document.getElementById("seatmap"),
moyaurl : "#{request.contextPath}",
map_id : #{ajaxMapView.map.id},
placereserve: #{ajaxMapView.queueEnabled?"false":"true"},
onclick : function(d) {
px.update();
// px.update();
//alert(d);
// #{ajaxMapView.isMgmtPermission()?'placeClicker([{name: \'placeId\', value: d}])':''}
return false;
......@@ -72,6 +72,8 @@
// px.enable_edit();
// });
//px.enable_edit();
// setInterval(function () { updateMap() }, 5000);
</script>
<h:panelGrid columns="3" cellpadding="10">
......
code/moya-web/WebContent/resources/cditools/bills/list.xhtml
<?xml version='1.0' encoding='UTF-8' ?>
<!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:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core" xmlns:composite="http://java.sun.com/jsf/composite"
xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:p="http://primefaces.org/ui" xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:tools="http://java.sun.com/jsf/composite/tools">
<html xmlns="http://www.w3.org/1999/xhtml"
xmlns:h="http://java.sun.com/jsf/html"
xmlns:f="http://java.sun.com/jsf/core"
xmlns:composite="http://java.sun.com/jsf/composite"
xmlns:ui="http://java.sun.com/jsf/facelets"
xmlns:p="http://primefaces.org/ui"
xmlns:c="http://java.sun.com/jsp/jstl/core"
xmlns:tools="http://java.sun.com/jsf/composite/tools">
<composite:interface>
</composite:interface>
<composite:implementation>
<h:outputText rendered="#{billListView.bills.rowCount le 0}" value="#{i18n['bills.noBills']}" />
<h:outputText rendered="#{billListView.bills.rowCount le 0}"
value="#{i18n['bills.noBills']}" />
<h:form rendered="#{billListView.canWriteBill}">
<p:commandButton ajax="false" action="#{billListView.showPayButtonsAction()}" value="#{i18n['bill.showPayButtons']}" />
<p:commandButton ajax="false"
action="#{billListView.showPayButtonsAction()}"
value="#{i18n['bill.showPayButtons']}" />
</h:form>
<h:form rendered="#{billListView.bills.rowCount gt 0}">
<p:dataTable styleClass="bordertable" id="billList" value="#{billListView.bills}" var="bill" rowStyleClass="#{bill.expired ? 'expired' : (bill.paidDate != null ? 'paid' : null)}" expandedRow="true">
<p:dataTable styleClass="bordertable" id="billList"
value="#{billListView.bills}" var="bill"
rowStyleClass="#{bill.expired ? 'expired' : (bill.paidDate != null ? 'paid' : null)}"
expandedRow="true">
<p:column style="width:16px" rendered="#{billListView.bills.rowCount lt 20}">
<p:rowToggler />
<p:column style="width:16px"
rendered="#{billListView.bills.rowCount lt 20}">
<p:rowToggler />
</p:column>
<p:column rendered="#{billListView.canWriteBill}">
<f:facet name="header">
<h:outputText value="#{i18n['bill.payer']}" />
</f:facet>
<h:link rendered="#{billListView.canWriteBill}" outcome="/useradmin/edit" value="#{bill.addr1}">
<h:link rendered="#{billListView.canWriteBill}"
outcome="/useradmin/edit" value="#{bill.addr1}">
<f:param name="userid" value="#{bill.user.user.id}" />
</h:link>
<h:outputText rendered="#{not billListView.canWriteBill}" value="#{bill.addr1}" />
<h:outputText rendered="#{not billListView.canWriteBill}"
value="#{bill.addr1}" />
</p:column>
<p:column>
<f:facet name="header">
<h:outputText value="${i18n['bill.sentDate']}" />
</f:facet>
<h:outputText value="#{bill.sentDateTime}">
<f:convertDateTime pattern="#{sessionHandler.datetimeFormat}" timeZone="#{sessionHandler.timezone}" />
<f:convertDateTime pattern="#{sessionHandler.datetimeFormat}"
timeZone="#{sessionHandler.timezone}" />
</h:outputText>
</p:column>
<p:column>
......@@ -54,30 +70,37 @@
<f:converter binding="#{referenceNumberConverter}" />
</h:outputText>
</p:column>
<!--
<p:column headerText="#{i18n['bill.notes']}" rendered="#{productShopView.gatherBillInfo}">
<h:outputText value="#{bill.notes}" />
</p:column>
-->
<p:column>
<f:facet name="header">
<h:outputText value="${i18n['bill.vat']}" />
<h:outputText value="${i18n['bill.totalPrice']}" />
</f:facet>
<h:outputText value="#{bill.totalVat()}">
<f:convertNumber currencyCode="EUR" maxFractionDigits="2" minFractionDigits="2" type="currency" locale="#{sessionHandler.locale}" />
<h:outputText value="#{bill.totalPrice()}">
<f:convertNumber currencyCode="EUR" maxFractionDigits="2"
minFractionDigits="2" type="currency"
locale="#{sessionHandler.locale}" />
</h:outputText>
</p:column>
<p:column>
<f:facet name="header">
<h:outputText value="${i18n['bill.totalPrice']}" />
<h:outputText value="${i18n['bill.vat']}" />
</f:facet>
<h:outputText value="#{bill.totalPrice()}">
<f:convertNumber currencyCode="EUR" maxFractionDigits="2" minFractionDigits="2" type="currency" locale="#{sessionHandler.locale}" />
<h:outputText value="#{bill.totalVat()}">
<f:convertNumber currencyCode="EUR" maxFractionDigits="2"
minFractionDigits="2" type="currency"
locale="#{sessionHandler.locale}" />
</h:outputText>
</p:column>
<p:column rendered="#{(!bill.expired and sessionHandler.isEventBoolProperty('ALLOW_BILLING')) or billListView.canWriteBill}">
<p:column
rendered="#{(!bill.expired and sessionHandler.isEventBoolProperty('ALLOW_BILLING')) or billListView.canWriteBill}">
<ui:fragment>
<a href="#{request.contextPath}/PrintBill?billid=#{bill.id}" target="_blank">#{i18n['bill.printBill']}</a>
<a href="#{request.contextPath}/PrintBill?billid=#{bill.id}"
target="_blank">#{i18n['bill.printBill']}</a>
</ui:fragment>
</p:column>
<p:column>
......@@ -91,23 +114,32 @@
</h:link>
</p:column>
<p:column rendered="#{billListView.canWriteBill}">
<p:commandButton update="billList" onerror="location.reload(true)" rendered="#{bill.paidDate == null and billListView.showPayButtons}" action="#{billListView.markPaid()}" value="#{i18n['bill.markPaid']}" />
<h:outputText rendered="#{bill.paidDate != null}" value="#{i18n['bill.isPaid']}" />
<h:outputText rendered="#{bill.paidDate == null and !billListView.showPayButtons}" value="#{i18n['bill.isNotPaid']}" />
<p:commandButton update="billList" onerror="location.reload(true)"
rendered="#{bill.paidDate == null and billListView.showPayButtons}"
action="#{billListView.markPaid()}"
value="#{i18n['bill.markPaid']}" />
<h:outputText rendered="#{bill.paidDate != null}"
value="#{i18n['bill.isPaid']}" />
<h:outputText
rendered="#{bill.paidDate == null and !billListView.showPayButtons}"
value="#{i18n['bill.isNotPaid']}" />
</p:column>
<p:column rendered="#{!billListView.canWriteBill}">
<h:outputText rendered="#{bill.paidDate != null}" value="#{i18n['bill.isPaid']}" />
<h:outputText rendered="#{bill.paidDate == null}" value="#{i18n['bill.isNotPaid']}" />
<h:outputText rendered="#{bill.paidDate != null}"
value="#{i18n['bill.isPaid']}" />
<h:outputText rendered="#{bill.paidDate == null}"
value="#{i18n['bill.isNotPaid']}" />
</p:column>
<p:rowExpansion rendered="#{billListView.bills.rowCount lt 20}">
<p:dataList value="#{bill.billLines}" var="line">
<p:dataList value="#{bill.billLines}" var="line">
<h:outputText value="#{line.name}" />:
<h:outputText value="#{line.quantity}">
<f:convertNumber minFractionDigits="0" maxFractionDigits="0" />
</h:outputText>
</p:dataList >
</p:dataList>
</p:rowExpansion>
</p:dataTable>
</h:form>
......
code/moya-web/WebContent/resources/seatjs/seatmap.js
......@@ -31,6 +31,11 @@ function placemap(opts)
opts.editclick = function(x, y) {return false;};
}
if(opts.placereserve === undefined)
{
opts.placereserve = false;
}
// px is returned object
var px = {
......@@ -40,7 +45,8 @@ function placemap(opts)
onclick: opts.onclick,
editclick: opts.editclick,
clicked_place: undefined,
locale: opts.locale || 'fi'
locale: opts.locale || 'fi',
placereserve: opts.placereserve,
};
if (px.locale == "und") px.locale == "fi";
......@@ -297,10 +303,13 @@ function placemap(opts)
{
places
.on('mouseover', show_tooltip)
.on('mouseout', hide_tooltip)
.on('click', function (d, i) {
toggle_clicked(d3.select(this));
});
.on('mouseout', hide_tooltip);
if(px.placereserve) {
places.on('click', function (d, i) {
toggle_clicked(d3.select(this));
});
}
}
}
......
code/moya-web/src/main/java/fi/codecrew/moya/rest/placemap/v1/PlacemapRestViewV1.java
......@@ -23,9 +23,12 @@ import org.slf4j.LoggerFactory;
import fi.codecrew.moya.beans.PermissionBeanLocal;
import fi.codecrew.moya.beans.PlaceBeanLocal;
import fi.codecrew.moya.beans.QueueBeanLocal;
import fi.codecrew.moya.beans.UserBeanLocal;
import fi.codecrew.moya.model.EventMap;
import fi.codecrew.moya.model.EventUser;
import fi.codecrew.moya.model.Place;
import fi.codecrew.moya.model.User;
import fi.codecrew.moya.rest.pojo.placemap.IntegerRoot;
import fi.codecrew.moya.rest.pojo.placemap.PlacemapMapRootPojo;
import fi.codecrew.moya.rest.pojo.placemap.SimplePlacePojo;
import fi.codecrew.moya.rest.pojo.placemap.SimplePlacelistRoot;
......@@ -50,6 +53,8 @@ public class PlacemapRestViewV1 {
@EJB
private QueueBeanLocal quebean;
@EJB
private UserBeanLocal userbean;
// @GET
// @Path("/maps")
......@@ -110,6 +115,29 @@ public class PlacemapRestViewV1 {
return SimplePlacelistRoot.wrap(thisplace, permbean.getCurrentUser());
}
@GET
@Path("/queue/{mapid}/{userid}")
public IntegerRoot getQueue(@PathParam("mapid") Integer mapid, @PathParam("userid") Integer userid) {
EventUser user = null;
if (userid != null) {
// We might not have permission to create user.. It should exist if we are querying this, but
// there is no guarantees of that
user = userbean.findByEventUserId(userid);
} else {
user = permbean.getCurrentUser();
}
if (user == null) {
return null;
}
EventMap map = placebean.findMap(mapid);
IntegerRoot root = new IntegerRoot();
root.setValue(quebean.getQueuePosition(map, user));
return root;
}
@POST
@Path("/place/{place}")
public Response togglePlaceReservation(@PathParam("place") Integer placeId)
......
code/moya-web/src/main/java/fi/codecrew/moya/rest/pojo/placemap/IntegerRoot.java 0 → 100644
package fi.codecrew.moya.rest.pojo.placemap;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlRootElement;
@XmlRootElement
public class IntegerRoot {
private Integer value = -1;
@XmlElement(name = "value")
public Integer getValue() {
return value;
}
public void setValue(Integer value) {
this.value = value;
}
}
code/moya-web/src/main/java/fi/codecrew/moya/servlet/IrcServlet.java
......@@ -122,11 +122,15 @@ public class IrcServlet extends HttpServlet {
* response)
*/
protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
String msg = request.getParameter("msg");
if (msg != null && !msg.isEmpty())
for (IrcBot b : bots) {
b.say(msg);
}
for (IrcBot b : bots) {
b.start();
}
// String msg = request.getParameter("msg");
// if (msg != null && !msg.isEmpty())
// for (IrcBot b : bots) {
// b.say(msg);
// }
}
/**
......
code/moya-web/src/main/java/fi/codecrew/moya/web/cdiview/map/AjaxMapView.java
package fi.codecrew.moya.web.cdiview.map;
import java.util.Collection;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import javax.ejb.EJB;
import javax.enterprise.context.ConversationScoped;
import javax.enterprise.context.RequestScoped;
import javax.faces.context.FacesContext;
import javax.inject.Inject;
......@@ -21,10 +21,12 @@ import fi.codecrew.moya.enums.apps.MapPermission;
import fi.codecrew.moya.exceptions.BortalCatchableException;
import fi.codecrew.moya.model.EventMap;
import fi.codecrew.moya.model.EventUser;
import fi.codecrew.moya.model.LanEvent;
import fi.codecrew.moya.model.Place;
import fi.codecrew.moya.model.PlaceSlot;
import fi.codecrew.moya.model.Product;
import fi.codecrew.moya.model.map.MapReservationQueueEntry;
import fi.codecrew.moya.web.cdiview.GenericCDIView;
import fi.codecrew.moya.web.cdiview.shop.ProductShopView;
import fi.codecrew.moya.web.cdiview.user.UserView;
@Named
......@@ -58,14 +60,67 @@ public class AjaxMapView extends GenericCDIView {
@EJB
private QueueBeanLocal quebean;
private Collection<Slotcounter> slotcount;
public static class Slotcounter {
private final Product product;
private Integer count = 0;
public Slotcounter(Product prod)
{
this.product = prod;
}
public Integer getCount() {
return count;
}
public Product getProduct() {
return product;
}
public void increment() {
++count;
}
}
public void initReserveMap() {
initMap();
map = placebean.findMap(mapId);
if (super.requirePermissions(MapPermission.BUY_PLACES) && map == null) {
EventUser u = userview.getSelectedUser();
EventMap map = initMap();
List<PlaceSlot> usersPlaceslots = placebean.getFreePlaceslots(u, map);
if (usersPlaceslots.isEmpty()) {
logger.info("There are no placeslots available for user");
map = null;
super.navihandler.forward("/shop/createBill?faces-redirect=true");
} else {
quebean.enterQueue(map, u);
countPlaceslots(usersPlaceslots);
}
}
}
private void countPlaceslots(List<PlaceSlot> slots)
{
HashMap<Product, Slotcounter> prodmap = new HashMap<Product, Slotcounter>();
for (PlaceSlot p : slots) {
if (!prodmap.containsKey(p.getProduct())) {
prodmap.put(p.getProduct(), new Slotcounter(p.getProduct()));
}
prodmap.get(p.getProduct()).increment();
}
slotcount = prodmap.values();
logger.info("Slotcount size {}", slotcount.size());
}
public void initViewMap() {
initMap();
if (super.requirePermissions(MapPermission.VIEW) && map == null) {
initMap();
}
}
private Boolean queEnabled = null;
......@@ -131,9 +186,14 @@ public class AjaxMapView extends GenericCDIView {
}
private Boolean reserving;
public boolean isReserving()
{
return quebean.isReserving(initMap(), permbean.getCurrentUser());
if (reserving == null) {
reserving = quebean.isReserving(initMap(), permbean.getCurrentUser());
}
return reserving;
}
public boolean canUserBuy() {
......@@ -143,6 +203,11 @@ public class AjaxMapView extends GenericCDIView {
);
}
public EventUser getEventuser()
{
return userview.getSelectedUser();
}
public String buySelectedPlaces() {
try {
EventUser user = userview.getSelectedUser();
......@@ -216,4 +281,14 @@ public class AjaxMapView extends GenericCDIView {
public void setQueueEntry(MapReservationQueueEntry queueEntry) {
this.queueEntry = queueEntry;
}
public Collection<Slotcounter> getSlotcount() {
return slotcount;
}
public void setSlotcount(Collection<Slotcounter> slotcount) {
this.slotcount = slotcount;
}
}
code/moya-web/src/main/resources/fi/codecrew/moya/resources/i18n.properties
......@@ -32,6 +32,9 @@ bill.billNumber = Tilausnumero
bill.cancel = Cancel bill
bill.expires = Expires
bill.isExpired = Bill is expired
bill.isNoPaid = Maksamatta
bill.isNotPaid = Maksamatta
bill.isPaid = Maksettu
bill.markPaid.cash = Maksa k\u00E4teisell\u00E4
bill.markPaid.cashOrCredit = K\u00E4teisell\u00E4 vai krediiteill\u00E4?
bill.markPaid.credits = Maksa krediiteill\u00E4
......@@ -41,6 +44,7 @@ bill.products = Tuotteet
bill.save = Save
bill.showPayButtons = Show pay buttons
billine.name = Lippu
billine.vatp = vat-%
bortalApplication.BILL = Creating, and managing bills
......@@ -136,6 +140,16 @@ error = Virhe
error.contact = If this happens again, contact Info with the following code:
error.error = You have encountered an error.
etickets.eticketcode = Lippu
etickets.place = Paikka
etickets.placeinfo = Paikkatiedot
etickets.placemap = Paikat kartalla
etickets.product = Lippu
etickets.sendAsMail = L\u00E4het\u00E4 s\u00E4hk\u00F6postina
etickets.showMap = N\u00E4yt\u00E4 kartta
etickets.title = Lippusi
etickets.user = Paikan omistaja
event.calendar.title = Tapahtumakalenteri
event.domains.title = Domain
event.edit = Edit
......@@ -220,6 +234,10 @@ incomingflow.usereditor = K\u00E4ytt\u00E4j\u00E4
incomingflow.usereditor.info = Tiedot
incomingflow.usereditor.picture = Kuvanotto
invite.permissionDenied = Sinulla ei ole oikeutta luovuttaa paikkaa eteenp\u00E4in.
invite.userLoginSuccessfull = Kutsu vastaanotettu onnistuneesti
invite.userLoginUnSuccessfull = Kirjautuminen ep\u00E4onnistui
lanEventPrivateProperty.defaultValue = Default value
lanEventPrivateProperty.editProperty = Edit property
lanEventPrivateProperty.save = Save
......@@ -290,6 +308,9 @@ manageparticipants.title = Osallistujat
map.id = #
mapView.check = P\u00E4ivit\u00E4 jonopaikka
mapView.enterQueue = Liity jonoon
menu = Valikko
mode.admin = Yll\u00E4piton\u00E4kym\u00E4
......@@ -312,6 +333,7 @@ page.bill.list.header = Bills
page.bill.listAll.header = Bills
page.bill.placemap.header = Place map
page.bill.show.header = Tilauksen tiedot
page.svm.error.header = Verkkomaksu ep\u00E4onnistui
pagegroup.auth.login = frontpage
......@@ -325,13 +347,24 @@ permissiondenied.alreadyLoggedIn = You don't have enough rights
permissiondenied.header = Access denied
permissiondenied.notLoggedIn = You don't have enough rights to enter this site.
placegroupview.toptext = \
place.cancelSend = Peruuta siirto
place.send = Siirr\u00E4 paikka
placegroup.showEticket = N\u00E4yt\u00E4 lippu
placegroupview.groupCreator = Tilaaja
placegroupview.owner = Omistaja
placegroupview.placetransferred = Paikka annettu eteenp\u00E4in
placegroupview.toptext = \
poll.edit = edit
print = Print
product.description = Kuvaus
product.expired = Vanhentuneet
product.name = Tuotteen nimi
product.price = Hinta (sis. alv)
product.providedRole = Product defines role
product.returnProductEdit = Return to product:
product.saved = Product saved
......@@ -368,6 +401,7 @@ roleView.showPermissioneditor = N\u00E4yt\u00E4 oikeusasetukset
save = Tallenna
shop.customPrice = Uusi hinta
shop.product.name = Lippu
shop.unitdiscount = Alennus
submenu.NotImplementedYet = Not implemented
......@@ -381,7 +415,11 @@ submenu.info.shop = Kauppa
submenu.lectureadmin.lectureParticipants = Tarkastele osallistujia
submenu.lectureadmin.manageLectureGroups = Hallinnoi
submenu.lectures.viewLectures = Ilmoittaudu
submenu.neomap.view = Paikkakartta
submenu.place.placemap = Paikkakartta
submenu.place.viewplacemap = Paikkatilanne
submenu.reports.basicStatistics = Tilastoja
submenu.shop.createBill = Osta lippuja
subnavi.cards = \u0009\u0009
subnavi.info = Info
......@@ -390,6 +428,8 @@ success = Onnistui
suffix.minutes = min
svm.success.successMessage = Verkkomaksu onnistui.
topnavi.adminlectures = Kurssit ja luennot
topnavi.license = Lisenssikoodit
topnavi.userlectures = Kurssit ja luennot
......@@ -428,92 +468,3 @@ usercart.showoverview = Vie tarkastusn\u00E4kym\u00E4\u00E4n
viewlectures.title = Kurssit ja luennot
yes = Kyll\u00E4
user.emailAndUsername=Email (toimii k\u00E4ytt\u00E4j\u00E4tunnuksena)
user.emailtooshortmessage=
user.emailsunmatch=
user.emailAgain=S\u00E4hk\u00F6posti (uudelleen)
user.email=S\u00E4hk\u00F6postiosoite
required=Arvo vaaditaan
user.createdmessage=K\u00E4ytt\u00E4j\u00E4tunnus on luotu onnistuneesti.
product.vat=ALV-%
productFlag.CREATE_NEW_PLACE_WHEN_BOUGHT=Luo uusi paikka ostettaessa
submenu.neomap.view=Paikkakartta
user.cancelInvite=Peruuta kutsu
user.invite.placeInvite.header=Liit\u00E4 paikka itsellesi
userview.userExistsByEmail=
invite.permissionDenied=Sinulla ei ole oikeutta luovuttaa paikkaa eteenp\u00E4in.
invite.userLoginSuccessfull=Kutsu vastaanotettu onnistuneesti
invite.userLoginUnSuccessfull=Kirjautuminen ep\u00E4onnistui
placegroupview.placetransferred=Paikka annettu eteenp\u00E4in
shop.create=
submenu.shop.createBill=Osta lippuja
submenu.shop.listReaders=
submenu.shop.shopToUser=
submenu.shop.showReaderEvents=
submenu.tournaments.admin.index=
submenu.bill.billSummary=
placegroupview.reservationProduct=
bill.isNoPaid=Maksamatta
product.expired=Vanhentuneet
product.edit=
etickets.title=Lippusi
etickets.place=Paikka
etickets.user=Paikan omistaja
etickets.product=Lippu
etickets.placeinfo=Paikkatiedot
etickets.eticketcode=Lippu
etickets.placemap=Paikat kartalla
placegroup.showEticket=N\u00E4yt\u00E4 lippu
mapView.enterQueue=Liity jonoon
mapView.check=P\u00E4ivit\u00E4 jonopaikka
submenu.place.placemap=Paikkakartta
submenu.poll.index=
submenu.product.create=
submenu.product.list=
product.name=Tuotteen nimi
placeSelect.placeName=
shop.product.name=Lippu
placeSelect.placePrice=
printedCard.cardState=
product.cashed=
product.shopInstant=
productshop.billCreated=
shop.cartPrice=
shop.product=
product.price=Hinta (sis. alv)
billine.name=Lippu
bill.receiverAddress=
bill.referencenumber=
billine.linePrice=
bortalApplication.networkauthentication.OVERRIDE_PLACE_REQUIREMENT=
submenu.place.viewplacemap=Paikkatilanne
svm.success.successMessage=Verkkomaksu onnistui.
template.loggedInAs=
page.svm.error.header=Verkkomaksu ep\u00E4onnistui
bill.isNotPaid=Maksamatta
bill.isPaid=Maksettu
bill.addr3=
bill.addr4=
bill.billIsPaid=
page.account.edit.header=
page.auth.login.loginerror.pagegroup=
page.product.create.pagegroup=
page.product.validateBillProducts.header=
page.role.create.pagegroup=
page.role.edit.pagegroup=
page.role.list.pagegroup=
page.shop.readerevents.header=
page.product.list.pagegroup=
page.tests.placemap.pagegroup=
place.groupremove=
placegroupView.editplace=
placegroupview.owner=Omistaja
placegroupview.groupCreator=Tilaaja
placegroupview.placeReleased=
place.mapX=
place.send=Siirr\u00E4 paikka
place.mapY=
place.cancelSend=Peruuta siirto
place.buyable=
etickets.sendAsMail=L\u00E4het\u00E4 s\u00E4hk\u00F6postina
etickets.showMap=N\u00E4yt\u00E4 kartta
code/moya-web/src/main/resources/fi/codecrew/moya/resources/i18n_en.properties
......@@ -76,6 +76,8 @@ bill.deliveryTerms = Delivery terms
bill.edit = edit
bill.expires = Expires
bill.isExpired = Bill is expired
bill.isNoPaid = Not paid
bill.isNotPaid = Not paid
bill.isPaid = Paid
bill.markPaid = Mark paid
bill.markPaid.cash = Buy with cash
......@@ -348,6 +350,16 @@ error = Error
error.contact = If this happens again, contact Info with the following code:
error.error = You have encountered an error.
etickets.eticketcode = Ticket
etickets.place = Place
etickets.placeinfo = Placeinfo
etickets.placemap = Places on map
etickets.product = Ticket
etickets.sendAsMail = Send as mail
etickets.showMap = Show map
etickets.title = Your ticket
etickets.user = Place owner
event.calendar.title = Event calendar
event.defaultRole = Default user role
event.domains.title = Domain
......@@ -561,8 +573,11 @@ invite.createNewUserHeader = Create new user
invite.emailexists = User with that email address already exists in the system.
invite.existingUserHeader = Login with existing username
invite.notFound = Invite invalid or already used
invite.permissionDenied = You don't have permission to regive this place.
invite.successfull = Invite sent successfully
invite.userCreateSuccessfull = User successfully created. You can now login.
invite.userLoginSuccessfull = Invite accepted successfully
invite.userLoginUnSuccessfull = Login unsuccessfull
javax.validation.constraints.AssertFalse.message = must be false
javax.validation.constraints.AssertTrue.message = must be true
......@@ -695,10 +710,19 @@ mapManage.lockedPlaces = Locked {0} places.
mapManage.releasedPlaces = Released {0} places
mapView.buyPlaces = Lock selected places
mapView.check = Check own queuestatus
mapView.enterQueue = Enter queue
mapView.errorWhenReleasingPlace = Error when releasing place
mapView.errorWhenReservingPlace = Error when reserving place!
mapView.errorWhileBuyingPlaces = Error when buying places. Please try again. If error reoccurs please contact organizers.
mapView.lockPlacesBeforeLeaving = Remember to lock the places before leaving this page
mapView.notEnoughCreditsToReserve = You don't have enough credits to reserve this place.
mapView.productcount.productcount = Number of tickets
mapView.productcount.productname = Ticket type
mapView.queuePosition = Your position in queue
mapView.queuePositionUpdated = Queue position updated
mapView.youAreInQueue = You are in queue Wait for your turn to select places.
mapView.yourPlaces = Your unused places
mapedit.save = Save map changes
......@@ -725,6 +749,8 @@ mode.user = Usermode
nasty.user = Go away!
neomap.updateMap = Update map
networkassociation.action = Action
networkassociation.create_association = Create association
networkassociation.create_time = Created on
......@@ -824,6 +850,7 @@ page.role.create.pagegroup = admin
page.role.edit.pagegroup = admin
page.role.list.pagegroup = admin
page.shop.readerevents.header = RFID shop
page.svm.error.header = Payment failed
page.svm.failure.header = Payment error
page.svm.notification.header = Suomen verkkomaksut notification
page.svm.pending.header = Payment pending
......@@ -864,6 +891,7 @@ permissiondenied.header = Access denied
permissiondenied.notLoggedIn = You don't have enough rights to enter this site.
place.buyable = Buyable
place.cancelSend = Cancel transfer
place.code = Placecode
place.commit = Save
place.description = Description
......@@ -881,6 +909,7 @@ place.product = Product
place.release = Release this place
place.releasetime = Releasetime
place.reserveForUser = Reserve for the user
place.send = Transfer place
place.width = Width
placeSelect.legend.blue = My selected place
......@@ -905,14 +934,17 @@ placegroup.name = Name
placegroup.placename = Place
placegroup.places = Places
placegroup.printPdf = Print tickets
placegroup.showEticket = Show eticket
placegroupView.editplace = Edit place
placegroupview.groupCreator = Orderer
placegroupview.header = My places
placegroupview.noMemberships = No places
placegroupview.owner = Owner
placegroupview.placeReleaseFailed = Releasing of place failed!
placegroupview.placeReleased = Place {0} released
placegroupview.placetransferred = Place is transferred
placegroupview.releasePlace = Release
placegroupview.reservationName = Place
placegroupview.reservationProduct = Ticket
......@@ -954,6 +986,7 @@ product.createDiscount = Add volumediscount
product.createLimit = Create product limitation
product.description = Description
product.edit = edit
product.expired = Expired
product.inventoryQuantity = Inventory count
product.name = Product name
product.paid = Paid
......@@ -1110,6 +1143,7 @@ shop.currentBalance = Current balance
shop.customPrice = new price
shop.price = price
shop.product = Product
shop.product.name = Ticket
shop.readBarcode = Read
shop.shop = Shop
shop.shoppingcartCommitted = Products bought
......@@ -1203,6 +1237,8 @@ submenu.license.manageCodes = Manage codes
submenu.license.viewCodes = View codes
submenu.map.create = Create map
submenu.map.list = List maps
submenu.neomap.reserve = Reserve places
submenu.neomap.view = Map
submenu.networkassociation.index = Associations
submenu.orgrole.create = Create organisationrole
submenu.orgrole.list = Organisation roles
......@@ -1214,6 +1250,7 @@ submenu.place.editGroup = Edit group
submenu.place.insertToken = Insert placecode
submenu.place.myGroups = Place reservations
submenu.place.placemap = Placemap
submenu.place.viewplacemap = Places status
submenu.poll.index = Polls
submenu.product.create = Create product
submenu.product.list = List products
......@@ -1627,40 +1664,3 @@ voting.create.voteEnd = Voting close
voting.create.voteStart = Voting start
yes = Yes
shop.unitdiscount=Discount
shop.customPrice=new price
user.emailAndUsername=Email (works also as username)
user.emailtooshortmessage=Email must be atleast {0} characters long.
user.emailsunmatch=Email addresses does not match.
user.emailAgain=Email (again)
required=Required
usercart.showoverview=
submenu.neomap.view=Map
user.cancelInvite=Cancel invite
user.invite.placeInvite.header=Receive sendet place
userview.userExistsByEmail=Email already exists\! You may already have an account.
invite.permissionDenied=You don't have permission to regive this place.
invite.userLoginSuccessfull=Invite accepted successfully
invite.userLoginUnSuccessfull=Login unsuccessfull
placegroupview.placetransferred=Place is transferred
bill.isNoPaid=Not paid
product.expired=Expired
etickets.title=Your ticket
etickets.place=Place
etickets.user=Place owner
etickets.product=Ticket
etickets.placeinfo=Placeinfo
etickets.eticketcode=Ticket
etickets.placemap=Places on map
placegroup.showEticket=Show eticket
mapView.enterQueue=Enter queue
mapView.check=Check own queuestatus
shop.product.name=Ticket
submenu.place.viewplacemap=Places status
page.svm.error.header=Payment failed
bill.isNotPaid=Not paid
placegroupview.owner=Owner
place.send=Transfer place
place.cancelSend=Cancel transfer
etickets.sendAsMail=Send as mail
etickets.showMap=Show map
code/moya-web/src/main/resources/fi/codecrew/moya/resources/i18n_fi.properties
......@@ -32,7 +32,7 @@ actionlog.create.submitbutton = L\u00E4het\u00E4
actionlog.create.taskradio = Teht\u00E4v\u00E4
actionlog.crew = Crew
actionlog.message = Tapahtuma
actionlog.messagelist.description = Voit seurata sek\u00E4 luoda uusia ActionMessageja t\u00E4ss\u00E4 n\u00E4kym\u00E4ss\u00E4.
actionlog.messagelist.description = Voit seurata sek\u00E4 luoda uusia ActionMessageja t\u00E4ss\u00E4 n\u00E4kym\u00E4ss\u00E4
actionlog.messagelist.header = Viestilista
actionlog.messagestate.DONE = Tehty
actionlog.messagestate.NEW = Uusi
......@@ -67,7 +67,7 @@ bill.allowStatistics = Tietoni saa julkaista tilastoissa
bill.billAmount = Tilauksen summa (sis. alv)
bill.billIsPaid = Tilaus on maksettu
bill.billLines = Tuotteet
bill.billMarkedPaidMail.message = Laskusi numero {0} on merkitty maksetuksi. Voit nyt siirty\u00E4 lippukauppaan varamaan haluamasi paikat. Tervetuloa tapahtumaan\!
bill.billMarkedPaidMail.message = Laskusi numero {0} on merkitty maksetuksi. Voit nyt siirty\u00E4 lippukauppaan varamaan haluamasi paikat. Tervetuloa tapahtumaan!
bill.billMarkedPaidMail.subject = Lasku merkitty maksetuksi
bill.billNumber = Tilausnumero
bill.billPaidDate = Maksup\u00E4iv\u00E4
......@@ -76,6 +76,8 @@ bill.deliveryTerms = Toimitusehdot
bill.edit = Muokkaa
bill.expires = Vanhentuu
bill.isExpired = Lasku on vanhentunut
bill.isNoPaid = Maksamatta
bill.isNotPaid = Maksamatta
bill.isPaid = Maksettu
bill.markPaid = Maksettu
bill.markPaid.cash = Maksa k\u00E4teisell\u00E4
......@@ -349,6 +351,16 @@ error = Virhe
error.contact = Jos t\u00E4m\u00E4 toistuu, ota seuraava koodi talteen ja ota yhteys Infoon:
error.error = Olet kohdannut virheen.
etickets.eticketcode = Lippu
etickets.place = Paikka
etickets.placeinfo = Paikkatiedot
etickets.placemap = Paikat kartalla
etickets.product = Lippu
etickets.sendAsMail = L\u00E4het\u00E4 s\u00E4hk\u00F6postiin
etickets.showMap = N\u00E4yt\u00E4 kartta
etickets.title = Lippusi
etickets.user = Paikan omistaja
event.calendar.title = Tapahtumakalenteri
event.defaultRole = K\u00E4ytt\u00E4jien oletusrooli
event.domains.title = Verkkotunnus
......@@ -571,8 +583,11 @@ invite.createNewUserHeader = Luo uusi k\u00E4ytt\u00E4j\u00E4tunnus
invite.emailexists = J\u00E4rjestelm\u00E4ss\u00E4 on jo k\u00E4ytt\u00E4j\u00E4tunnus samalla s\u00E4hk\u00F6postiosoitteella.
invite.existingUserHeader = Kirjaudu sis\u00E4\u00E4n olemassaolevalla tunnuksella
invite.notFound = Kutsu virheellinen tai jo k\u00E4ytetty.
invite.permissionDenied = Sinulla ei ole oikeutta luovuttaa paikkaa eteenp\u00E4in.
invite.successfull = Kutsu l\u00E4hetetty
invite.userCreateSuccessfull = K\u00E4ytt\u00E4j\u00E4tunnus luotu onnistuneesti. Voit nyt kirjautua sis\u00E4\u00E4n j\u00E4rjeselm\u00E4\u00E4n.
invite.userLoginSuccessfull = Kutsu vastaanotettu onnistuneesti
invite.userLoginUnSuccessfull = Kirjautuminen ep\u00E4onnistui
javax.validation.constraints.AssertFalse.message = must be false
javax.validation.constraints.AssertTrue.message = must be true
......@@ -704,10 +719,19 @@ mapManage.lockedPlaces = Lukittu kartasta {0} paikkaa.
mapManage.releasedPlaces = Vapautettu kartasta {0} paikkaa
mapView.buyPlaces = Lukitse valitut paikat
mapView.check = P\u00E4ivit\u00E4 jonopaikka
mapView.enterQueue = Liity jonoon
mapView.errorWhenReleasingPlace = Paikkaa vapauttassa tapahtui virhe.
mapView.errorWhenReservingPlace = Paikkaa varatessa tapahtui virhe.
mapView.errorWhileBuyingPlaces = Virhe paikkojen ostossa. Ole hyv\u00E4 ja yrit\u00E4 uudelleen. Jos virhe toistuu ota yhteytt\u00E4 j\u00E4rjest\u00E4jiin.
mapView.lockPlacesBeforeLeaving = Lukitse paikat ennen sivulta poistumista
mapView.notEnoughCreditsToReserve = Sinulla ei ole riitt\u00E4v\u00E4sti suoritettuja konepaikkamaksuja t\u00E4m\u00E4n paikan varaamiseen.
mapView.productcount.productcount = Lippujen m\u00E4\u00E4r\u00E4
mapView.productcount.productname = Lipputyyppi
mapView.queuePosition = Paikkasi jonossa
mapView.queuePositionUpdated = Jonotustieto p\u00E4ivitetty
mapView.youAreInQueue = Olet jonossa. Odota vuoroasi valitaksesi haluamasi paikat.
mapView.yourPlaces = Varaamattomat paikkasi
mapedit.save = Tallenna muutokset
......@@ -734,6 +758,8 @@ mode.user = K\u00E4ytt\u00E4j\u00E4n\u00E4kym\u00E4
nasty.user = Mene pois!
neomap.updateMap = P\u00E4ivit\u00E4 kartta
networkassociation.action = Toiminto
networkassociation.create_association = Luo assosiaatio
networkassociation.create_time = Luontiaika
......@@ -816,6 +842,7 @@ page.place.mygroups.header = Paikkaryhm\u00E4t
page.place.placemap.header = Paikkakartta
page.product.createBill.header = Osta tuotteita
page.product.validateBillProducts.header = Tilaus luotu
page.svm.error.header = Verkkomaksu ep\u00E4onnistui
page.svm.failure.header = Verkkomaksuvirhe
page.svm.notification.header = Maksutapahtuman rekister\u00F6inti
page.svm.pending.header = Maksukuittausta odotetaan
......@@ -846,6 +873,7 @@ permissiondenied.header = P\u00E4\u00E4sy kielletty
permissiondenied.notLoggedIn = Sinulla ei ole riitt\u00E4v\u00E4sti oikeuksia t\u00E4lle sivulle.
place.buyable = Ostettavissa
place.cancelSend = Peruuta siirto
place.code = Paikkakoodi
place.commit = Tallenna
place.description = Kuvaus
......@@ -864,6 +892,7 @@ place.product = Tuote
place.release = Vapauta paikka
place.releasetime = Vapautusaika
place.reserveForUser = Varaa k\u00E4ytt\u00E4j\u00E4lle
place.send = Siirr\u00E4 paikka
place.width = Leveys
placeSelect.legend.blue = Oma valittu paikka
......@@ -888,14 +917,17 @@ placegroup.name = Nimi
placegroup.placename = Paikka
placegroup.places = Paikat
placegroup.printPdf = Tulosta lipputositteet
placegroup.showEticket = N\u00E4yt\u00E4 lippu
placegroupView.editplace = Muokkaa paikkaa
placegroupview.groupCreator = Tilaaja
placegroupview.header = Omat paikat
placegroupview.noMemberships = Ei omia paikkoja
placegroupview.owner = Omistaja
placegroupview.placeReleaseFailed = Paikan vapauttaminen ep\u00E4onnistui!
placegroupview.placeReleased = Paikka {0} vapautettu
placegroupview.placetransferred = Paikka on annettu eteenp\u00E4in.
placegroupview.releasePlace = Vapauta
placegroupview.reservationName = Paikka
placegroupview.reservationProduct = Lippu
......@@ -937,6 +969,7 @@ product.createDiscount = Lis\u00E4\u00E4 m\u00E4\u00E4r\u00E4alennus
product.createLimit = Luo tuoterajoite
product.description = Kuvaus
product.edit = Muokkaa
product.expired = Vanhentuneet
product.inventoryQuantity = Varastotilanne
product.name = Tuotteen nimi
product.paid = Maksettu
......@@ -1092,6 +1125,7 @@ shop.currentBalance = T\u00E4m\u00E4nhetkinen saldo
shop.customPrice = Uusi hinta
shop.price = Hinta
shop.product = Tuote
shop.product.name = Lippu
shop.readBarcode = Lue
shop.shoppingcartCommitted = Tuotteet ostettu
shop.toAccountValue = Tilille
......@@ -1183,7 +1217,8 @@ submenu.license.manageCodes = Hallinnoi lisenssej\u00E4
submenu.license.viewCodes = N\u00E4yt\u00E4 koodit
submenu.map.create = Uusi kartta
submenu.map.list = N\u00E4yt\u00E4 kartat
submenu.neomap.view = Varaa paikkasi
submenu.neomap.reserve = Varaa paikkasi
submenu.neomap.view = Paikkakartta
submenu.networkassociation.index = Assosiaatiot
submenu.orgrole.create = Luo j\u00E4rjest\u00E4j\u00E4rooli
submenu.orgrole.list = J\u00E4rjest\u00E4j\u00E4roolit
......@@ -1195,6 +1230,7 @@ submenu.place.editGroup = Muokkaa ryhm\u00E4\u00E4
submenu.place.insertToken = Sy\u00F6t\u00E4 paikkakoodi
submenu.place.myGroups = Omat paikkavaraukset
submenu.place.placemap = Paikkakartta
submenu.place.viewplacemap = Paikkatilanne
submenu.poll.index = Kyselyt
submenu.product.create = Uusi tuote
submenu.product.list = Listaa tuotteet
......@@ -1610,38 +1646,3 @@ voting.create.voteEnd = \u00C4\u00E4nestys kiinni
voting.create.voteStart = \u00C4\u00E4nestys auki
yes = Kyll\u00E4
shop.unitdiscount=Alennus
shop.customPrice=Uusi hinta
user.emailAndUsername=S\u00E4hk\u00F6posti (toimii my\u00F6s k\u00E4ytt\u00E4j\u00E4tunnuksena)
user.emailtooshortmessage=S\u00E4hk\u00F6postin tarvitsee olla v\u00E4hint\u00E4\u00E4n {0} merkki\u00E4 pitk\u00E4.
user.emailsunmatch=S\u00E4hk\u00F6postiosoitteet eiv\u00E4t t\u00E4sm\u00E4\u00E4.
user.emailAgain=S\u00E4hk\u00F6posti (uudelleen)
required=Vaaditaan
user.cancelInvite=Peruuta kutsu
user.invite.placeInvite.header=Vastaanota l\u00E4hetetty paikka
userview.userExistsByEmail=S\u00E4hk\u00F6posti on jo olemassa. Sinulla saattaa jo olla tunnus j\u00E4rjestelm\u00E4ss\u00E4.
invite.permissionDenied=Sinulla ei ole oikeutta luovuttaa paikkaa eteenp\u00E4in.
invite.userLoginSuccessfull=Kutsu vastaanotettu onnistuneesti
invite.userLoginUnSuccessfull=Kirjautuminen ep\u00E4onnistui
placegroupview.placetransferred=Paikka on annettu eteenp\u00E4in.
bill.isNoPaid=Maksamatta
product.expired=Vanhentuneet
etickets.title=Lippusi
etickets.place=Paikka
etickets.user=Paikan omistaja
etickets.product=Lippu
etickets.placeinfo=Paikkatiedot
etickets.eticketcode=Lippu
etickets.placemap=Paikat kartalla
placegroup.showEticket=N\u00E4yt\u00E4 lippu
mapView.enterQueue=Liity jonoon
mapView.check=P\u00E4ivit\u00E4 jonopaikka
shop.product.name=Lippu
submenu.place.viewplacemap=Paikkatilanne
page.svm.error.header=Verkkomaksu ep\u00E4onnistui
bill.isNotPaid=Maksamatta
placegroupview.owner=Omistaja
place.send=Siirr\u00E4 paikka
place.cancelSend=Peruuta siirto
etickets.sendAsMail=L\u00E4het\u00E4 s\u00E4hk\u00F6postiin
etickets.showMap=N\u00E4yt\u00E4 kartta
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!