Commit 04f3bb17 by Tuukka Kivilahti

old ticket system, fixed ui -bug from place reserve

1 parent 88d6b2af
...@@ -54,4 +54,5 @@ public interface PlaceGroupBeanLocal { ...@@ -54,4 +54,5 @@ public interface PlaceGroupBeanLocal {
GroupMembership markGroupMembershipNotEntered(GroupMembership membership); GroupMembership markGroupMembershipNotEntered(GroupMembership membership);
void reserveForSelf(GroupMembership gm);
} }
...@@ -186,6 +186,7 @@ public class PlaceGroupBean implements PlaceGroupBeanLocal { ...@@ -186,6 +186,7 @@ public class PlaceGroupBean implements PlaceGroupBeanLocal {
y += 30; y += 30;
int placeCount = 0;
for (GroupMembership membership : memberships) { for (GroupMembership membership : memberships) {
if (y > 750) { if (y > 750) {
...@@ -196,6 +197,7 @@ public class PlaceGroupBean implements PlaceGroupBeanLocal { ...@@ -196,6 +197,7 @@ public class PlaceGroupBean implements PlaceGroupBeanLocal {
if (printOnlyOwn && (membership.getUser() == null || !membership.getUser().equals(usr))) { if (printOnlyOwn && (membership.getUser() == null || !membership.getUser().equals(usr))) {
continue; continue;
} }
placeCount++;
// //
// PNGImage jpeg = new // PNGImage jpeg = new
...@@ -260,7 +262,9 @@ public class PlaceGroupBean implements PlaceGroupBeanLocal { ...@@ -260,7 +262,9 @@ public class PlaceGroupBean implements PlaceGroupBeanLocal {
String footertext = "Nämä lipputositteenne tulee olla tulostettuna paperille kun saavutte tapahtumaan."; String footertext = "Nämä lipputositteenne tulee olla tulostettuna paperille kun saavutte tapahtumaan.";
if (printOnlyOwn || memberships.size() <= 1) { if(placeCount == 0) {
footertext = "Sinun tulee istua jollain paikalla ennenkuin voit tulostaa lippusi.";
} else if (placeCount <= 1) {
footertext = "Tämä henkilökohtainen lipputositteesi tulee olla mukana tulostettuna paperille kun saavut tapahtumaan."; footertext = "Tämä henkilökohtainen lipputositteesi tulee olla mukana tulostettuna paperille kun saavut tapahtumaan.";
} }
...@@ -326,4 +330,21 @@ public class PlaceGroupBean implements PlaceGroupBeanLocal { ...@@ -326,4 +330,21 @@ public class PlaceGroupBean implements PlaceGroupBeanLocal {
membership = gmemfacade.merge(membership); membership = gmemfacade.merge(membership);
return membership; return membership;
} }
@Override
public void reserveForSelf(GroupMembership gm) {
gm = gmemfacade.reload(gm);
if (gm != null && gm.getUser() == null) {
loggerbean.sendMessage(MoyaEventType.INVITE_ACCEPTED, gm.getPlaceGroup().getCreator(), "Moya place accepted by user. ", gm.getPlaceGroup().getCreator());
// change token, just in case
gm.setInviteToken(gmemfacade.createInviteToken());
gm.setUser(gm.getPlaceGroup().getCreator());
}
}
} }
...@@ -36,7 +36,10 @@ ...@@ -36,7 +36,10 @@
<f:facet name="header"> <f:facet name="header">
<h:outputText value="#{i18n['placegroupview.owner']}" /> <h:outputText value="#{i18n['placegroupview.owner']}" />
</f:facet> </f:facet>
<h:outputText rendered="#{empty member.user}" value="#{member.placeGroup.creator.firstnames} #{member.placeGroup.creator.lastname} (#{member.placeGroup.creator.nick})" /> <h:outputText rendered="#{empty member.user and !placeGroupView.reserveForSelfActive}" value="#{member.placeGroup.creator.firstnames} #{member.placeGroup.creator.lastname} (#{member.placeGroup.creator.nick})" />
<p:commandButton rendered="#{empty member.user and placeGroupView.reserveForSelfActive}" update="placestable" actionListener="#{placeGroupView.reserveForSelf}" value="#{i18n['placegroupview.reserveForSelf']}" />
<h:outputText rendered="#{(!empty member.user) and placeGroupView.canModifyCurrent}" value="#{member.user.firstnames} #{member.user.lastname} (#{member.user.nick})" /> <h:outputText rendered="#{(!empty member.user) and placeGroupView.canModifyCurrent}" value="#{member.user.firstnames} #{member.user.lastname} (#{member.user.nick})" />
<h:outputText rendered="#{(!empty member.user) and !placeGroupView.canModifyCurrent}" value="#{i18n['placegroupview.placetransferred']}" /> <h:outputText rendered="#{(!empty member.user) and !placeGroupView.canModifyCurrent}" value="#{i18n['placegroupview.placetransferred']}" />
</p:column> </p:column>
......
...@@ -212,6 +212,26 @@ public class PlacegroupView extends GenericCDIView { ...@@ -212,6 +212,26 @@ public class PlacegroupView extends GenericCDIView {
return null; return null;
} }
/**
* When using "old" ticket -system, you cannot print empty places, that's why we need a button to reserve place for self
* @return
*/
public boolean isReserveForSelfActive() {
return (!eventBean.getPropertyBoolean(LanEventPropertyKey.USE_ETICKET) && eventBean.getPropertyBoolean(LanEventPropertyKey.PLACECODE_PRINT_ONLY_OWN));
}
public void reserveForSelf() {
GroupMembership row = memberlist.getRowData();
if (row != null) {
if (permbean.isCurrentUser(row.getPlaceGroup().getCreator()) || permbean.hasPermission(MapPermission.MANAGE_OTHERS)) {
placegroupBean.reserveForSelf(row);
}
}
}
public void lockSlot() { public void lockSlot() {
PlaceSlot row = placeslots.getRowData(); PlaceSlot row = placeslots.getRowData();
placeslotBean.lockSlot(row); placeslotBean.lockSlot(row);
......
...@@ -528,3 +528,4 @@ vipProduct.name = Tuote ...@@ -528,3 +528,4 @@ vipProduct.name = Tuote
vipProduct.quantity = Lukum\u00E4\u00E4r\u00E4 vipProduct.quantity = Lukum\u00E4\u00E4r\u00E4
yes = Kyll\u00E4 yes = Kyll\u00E4
placegroupview.reserveForSelf=Valitse paikka itsellesi
...@@ -1749,3 +1749,4 @@ voting.create.voteEnd = Voting close ...@@ -1749,3 +1749,4 @@ voting.create.voteEnd = Voting close
voting.create.voteStart = Voting start voting.create.voteStart = Voting start
yes = Yes yes = Yes
placegroupview.reserveForSelf=Select place for yourself
...@@ -1733,3 +1733,4 @@ voting.create.voteEnd = \u00C4\u00E4nestys kiinni ...@@ -1733,3 +1733,4 @@ voting.create.voteEnd = \u00C4\u00E4nestys kiinni
voting.create.voteStart = \u00C4\u00E4nestys auki voting.create.voteStart = \u00C4\u00E4nestys auki
yes = Kyll\u00E4 yes = Kyll\u00E4
placegroupview.reserveForSelf=Valitse paikka itsellesi
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!