ui puolta placecodesiin

code/moya-beans/ejbModule/fi/codecrew/moya/beans/MenuBean.java

@@ -26,24 +26,10 @@ import javax.ejb.EJB;
 import javax.ejb.LocalBean;
 import javax.ejb.Stateless;
 
+import fi.codecrew.moya.enums.apps.*;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import fi.codecrew.moya.enums.apps.BillPermission;
-import fi.codecrew.moya.enums.apps.CompoPermission;
-import fi.codecrew.moya.enums.apps.ContentPermission;
-import fi.codecrew.moya.enums.apps.EventPermission;
-import fi.codecrew.moya.enums.apps.LecturePermission;
-import fi.codecrew.moya.enums.apps.LicensePermission;
-import fi.codecrew.moya.enums.apps.MapPermission;
-import fi.codecrew.moya.enums.apps.NetworkAssociationPermission;
-import fi.codecrew.moya.enums.apps.PollPermission;
-import fi.codecrew.moya.enums.apps.ShopPermission;
-import fi.codecrew.moya.enums.apps.SpecialPermission;
-import fi.codecrew.moya.enums.apps.TerminalPermission;
-import fi.codecrew.moya.enums.apps.TournamentPermission;
-import fi.codecrew.moya.enums.apps.UserPermission;
-import fi.codecrew.moya.enums.apps.VipPermission;
 import fi.codecrew.moya.facade.MenuNavigationFacade;
 import fi.codecrew.moya.facade.MenuitemFacade;
 import fi.codecrew.moya.model.LanEvent;
@@ -133,6 +119,7 @@ public class MenuBean implements MenuBeanLocal {
 
 		userEvent.addPage(menuitemfacade.findOrCreate("/user/invite"), UserPermission.INVITE_USERS);
 		userEvent.addPage(menuitemfacade.findOrCreate("/feedback/index"), UserPermission.VITUTTAAKO);
+		userEvent.addPage(menuitemfacade.findOrCreate("/temp/pms"), PmsCodePermission.VIEW);
 
 		MenuNavigation helpmenu = usermenu.addPage(null, null);
 		helpmenu.setKey("topnavi.help");

code/moya-beans/ejbModule/fi/codecrew/moya/beans/PermissionBean.java

@@ -28,21 +28,10 @@ import javax.ejb.SessionContext;
 import javax.ejb.Stateless;
 import javax.resource.spi.IllegalStateException;
 
+import fi.codecrew.moya.enums.apps.*;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import fi.codecrew.moya.enums.apps.BillPermission;
-import fi.codecrew.moya.enums.apps.CompoPermission;
-import fi.codecrew.moya.enums.apps.ContentPermission;
-import fi.codecrew.moya.enums.apps.EventPermission;
-import fi.codecrew.moya.enums.apps.IAppPermission;
-import fi.codecrew.moya.enums.apps.LicensePermission;
-import fi.codecrew.moya.enums.apps.MapPermission;
-import fi.codecrew.moya.enums.apps.PollPermission;
-import fi.codecrew.moya.enums.apps.ShopPermission;
-import fi.codecrew.moya.enums.apps.SpecialPermission;
-import fi.codecrew.moya.enums.apps.TerminalPermission;
-import fi.codecrew.moya.enums.apps.UserPermission;
 import fi.codecrew.moya.facade.EventUserFacade;
 import fi.codecrew.moya.facade.UserFacade;
 import fi.codecrew.moya.model.EventUser;
@@ -114,7 +103,9 @@ import fi.codecrew.moya.model.User;
 		EventPermission.S_MANAGE_PROPERTIES,
 
 		LicensePermission.S_MANAGE,
-		LicensePermission.S_VIEW_OWN_CODES
+		LicensePermission.S_VIEW_OWN_CODES,
+
+		PmsCodePermission.S_VIEW
 })
 @LocalBean
 public class PermissionBean implements PermissionBeanLocal {

code/moya-utils/src/main/java/fi/codecrew/moya/enums/BortalApplication.java

@@ -20,6 +20,9 @@ package fi.codecrew.moya.enums;
 
 import fi.codecrew.moya.enums.apps.*;
 
+
+// TODO: Bortal? oikeasti? Edes vähän ruma?
+// Muuttaminen vaatii kantamuutoksia ja pitännee tehdä erittäin huolellisesti.
 public enum BortalApplication {
 	USER(UserPermission.class),
 	BILL(BillPermission.class),
@@ -35,7 +38,8 @@ public enum BortalApplication {
 	LICENSE(LicensePermission.class),
 	TOURNAMENT(TournamentPermission.class),
 	NETWORKASSOCIATION(NetworkAssociationPermission.class),
-	VIP(VipPermission.class)
+	VIP(VipPermission.class),
+	PMS(PmsCodePermission.class),
 	;
 
 	private final String key;

code/moya-utils/src/main/java/fi/codecrew/moya/enums/apps/PmsCodePermission.java

+/*
+ * Copyright Codecrew Ry
+ * 
+ * All rights reserved.
+ * 
+ * This license applies to any software containing a notice placed by the 
+ * copyright holder. Such software is herein referred to as the Software. 
+ * This license covers modification, distribution and use of the Software. 
+ * 
+ * Any distribution and use in source and binary forms, with or without 
+ * modification is not permitted without explicit written permission from the 
+ * copyright owner. 
+ * 
+ * A non-exclusive royalty-free right is granted to the copyright owner of the 
+ * Software to use, modify and distribute all modifications to the Software in 
+ * future versions of the Software. 
+ * 
+ */
+package fi.codecrew.moya.enums.apps;
+
+import fi.codecrew.moya.enums.BortalApplication;
+
+public enum PmsCodePermission implements IAppPermission {
+	VIEW
+
+	;
+
+	public static final String S_VIEW = "PMS/VIEW";
+
+
+	private final String fullName;
+	private final String key;
+
+	private static final String I18N_HEADER = "bortalApplication.pms.";
+
+	private PmsCodePermission() {
+		key = I18N_HEADER + name();
+		fullName = new StringBuilder().append(getParent().toString()).append(DELIMITER).append(toString()).toString();
+
+	}
+
+	@Override
+	public BortalApplication getParent() {
+		return BortalApplication.PMS;
+	}
+
+	@Override
+	public String getFullName() {
+		return fullName;
+	}
+
+	@Override
+	public String getI18nKey() {
+		return key;
+	}
+
+}

code/moya-web/WebContent/temp/pms.xhtml

+<!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:p="http://primefaces.org/ui" xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core">
+<h:head>
+	<title></title>
+</h:head>
+<h:body>
+	<ui:composition template="#{sessionHandler.template}">
+		<f:metadata>
+			<f:metadata>
+				<f:viewParam name="userid" value="#{userView.userid}" />
+				<f:event type="preRenderView" listener="#{userView.initView}" />
+			</f:metadata>
+
+		</f:metadata>
+		<ui:define name="content">
+			<!--
+			 Olemme pahoillamme tästä käyttöliittymähuipentumasta.
+
+			 Koitimme tehdä kaikkemme että saataisiin kirjautuminen moya-tunnuksilla suoraan pms:n, mutta tätä ideaa ei hyväksytty.
+			 Eli tässä on kirjautuminen toteutettuna siten kuin se meiltä vaadittiin.
+
+			 -Tuukka (TKffTK) Kivilahti, CodeCrew
+			 -->
+			<h1>#{i18n['tmp.yourpmscodes']}</h1>
+			<h:outputText rendered="#{placeGroupView.groupMemberships.rowCount == 0}" value="#{i18n['placegroupview.noMemberships']}" />
+			<h:form rendered="#{placeGroupView.groupMemberships.rowCount > 0}" id="placelistform" styleClass="moya_datatable2">
+				<p:dataTable value="#{placeGroupView.groupMemberships}" var="member" id="placestable">
+
+					<p:column>
+						<f:facet name="header">
+							<h:outputText value="#{i18n['placegroupview.reservationName']}" />
+						</f:facet>
+						<h:outputText value="#{member.placeReservation.name}" />
+					</p:column>
+					<p:column>
+						<f:facet name="header">
+							<h:outputText value="#{i18n['placegroupview.reservationProduct']}" />
+						</f:facet>
+						<h:outputText value="#{member.placeReservation.product.name}" />
+					</p:column>
+
+					<p:column>
+						<f:facet name="header">
+							<h:outputText value="#{i18n['tmp.code']}" />
+						</f:facet>
+						<h:outputText rendered="#{(!empty member.user) and !placeGroupView.canModifyCurrent}" value="#{i18n['placegroupview.placetransferred']}" />
+						<h:outputText rendered="#{(empty member.user) or placeGroupView.canModifyCurrent}" value="#{member.placeReservation.code}" />
+					</p:column>
+
+				</p:dataTable>
+
+
+			</h:form>
+
+		</ui:define>
+	</ui:composition>
+	
+</h:body>
+</html>
\ No newline at end of file

code/moya-web/src/main/resources/fi/codecrew/moya/resources/i18n.properties

@@ -2,6 +2,7 @@
 #Generated by ResourceBundle Editor (http://eclipse-rbe.sourceforge.net)
 #Sat Mar 30 17:56:44 EET 2013
 
+acc_line.eventuser=
 accountEvent.commit = Tallenna
 
 actionlog.create.header = Create new actionmessage
@@ -538,3 +539,6 @@ vipProduct.quantity = Lukum\u00E4\u00E4r\u00E4
 
 yes = Kyll\u00E4
 vip.delete=Poista
+tmp.yourpmscodes=PMS -koodisi
+tmp.code=Koodi
+submenu.temp.pms=Pms koodit

code/moya-web/src/main/resources/fi/codecrew/moya/resources/i18n_en.properties

@@ -1779,3 +1779,6 @@ voting.create.voteStart     = Voting start
 
 yes = Yes
 vip.delete=Delete
+tmp.yourpmscodes=Your pms -codes
+tmp.code=Code
+submenu.temp.pms=PMS codes

code/moya-web/src/main/resources/fi/codecrew/moya/resources/i18n_fi.properties

@@ -1764,3 +1764,6 @@ voting.create.voteStart     = \u00C4\u00E4nestys auki
 
 yes = Kyll\u00E4
 vip.delete=Poista
+tmp.yourpmscodes=PMS -koodisi
+tmp.code=Koodi
+submenu.temp.pms=PMS koodit