sisääntulostuffia

code/MoyaBeans/ejbModule/fi/codecrew/moya/beans/PlaceGroupBean.java

 package fi.codecrew.moya.beans;
 
 import java.io.OutputStream;
+import java.util.Calendar;
 import java.util.List;
 
 import javax.annotation.security.DeclareRoles;
@@ -287,4 +288,17 @@ public class PlaceGroupBean implements PlaceGroupBeanLocal {
 	public List<PlaceGroup> getPlacegroups(EventUser user) {
 		return pgfacade.find(user);
 	}
+
+	@Override
+	public void markGrouMembershipEntered(GroupMembership membership) {
+		membership.setEnteredEvent(Calendar.getInstance());
+		membership = gmemfacade.merge(membership);
+	}
+
+	@Override
+	public void markGrouMembershipNotEntered(GroupMembership membership) {
+		membership.setEnteredEvent(null);
+		membership = gmemfacade.merge(membership);
+		
+	}
 }

code/MoyaBeansClient/ejbModule/fi/codecrew/moya/beans/PlaceGroupBeanLocal.java

@@ -22,6 +22,8 @@ public interface PlaceGroupBeanLocal {
 
 	List<GroupMembership> getMembershipsAndCreations(EventUser user);
 
+	
+
 	List<GroupMembership> getMemberships(EventUser user);
 
 	List<PlaceGroup> getPlacegroups(EventUser user);
@@ -30,4 +32,8 @@ public interface PlaceGroupBeanLocal {
 
 	boolean associateToToken(EventUser user, String token);
 
+	void markGrouMembershipEntered(GroupMembership row);
+
+	void markGrouMembershipNotEntered(GroupMembership row);
+
 }

code/MoyaDatabase/src/fi/codecrew/moya/model/GroupMembership.java

@@ -138,7 +138,7 @@ public class GroupMembership extends GenericEntity {
     public void setEnteredEvent(Calendar enteredEvent) {
         this.enteredEvent = enteredEvent;
     }
-
+    
     public void setInviteToken(String inviteToken) {
         this.inviteToken = inviteToken;
     }

code/MoyaWeb/WebContent/admin/incoming/printCard.xhtml

@@ -39,6 +39,47 @@
 				
 
 			</h:panelGrid>
+			
+			<h:outputText rendered="#{empty incomingView.groupMemberships}" value="#{i18n['placegroupview.noMemberships']}" />
+			<h:form rendered="#{!empty incomingViewgroupMemberships}" id="placelistform">	
+
+				<p:dataTable value="#{incomingView.groupMemberships}" var="member">
+
+					<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['placegroupview.token']}" />
+						</f:facet>
+						<h:outputText rendered="#{empty member.user}" value="#{member.inviteToken}" />
+						<h:outputText rendered="#{!empty member.user}" value="#{member.user.firstnames} #{member.user.lastname} (#{member.user.nick})" />
+
+					</p:column>
+					<p:column>
+						<f:facet name="header">
+							<h:outputText value="#{i18n['placegroupview.groupCreator']}" />
+						</f:facet>
+						<h:outputText value="#{member.placeGroup.creator.firstnames} #{member.placeGroup.creator.lastname} (#{member.placeGroup.creator.nick})" />
+
+					</p:column>
+
+					<p:column>
+						<h:commandButton rendered="#{empty member.enteredEvent}" action="#{incomingView.givePlace}" value="#{i18n['incomingflow.giveplace']}" />
+						<h:commandButton rendered="#{!empty member.enteredEvent}" action="#{incomingView.ungivePlace}" value="#{i18n['incomingflow.ungiveplace']}" />
+					</p:column>
+
+				</p:dataTable>
+			</h:form>
 
 			<h1>#{i18n['incomingflow.search']}</h1>
 			<h:form>

code/MoyaWeb/src/fi/codecrew/moya/resources/i18n.properties

@@ -157,6 +157,8 @@ global.save                 = Save
 
 httpsession.creationTime = Created
 
+incomingflow.giveplace   = Merkitse annetuksi
+
 lanEventPrivateProperty.defaultValue          = Default value
 lanEventPrivateProperty.editProperty          = Edit property
 lanEventPrivateProperty.save                  = Save

code/MoyaWeb/src/fi/codecrew/moya/resources/i18n_en.properties

@@ -409,8 +409,10 @@ importuser.file     = File
 importuser.template = Template
 
 incomingflow.barcode     = Barcode
+incomingflow.giveplace   = Mark given
 incomingflow.multisearch = Multisearch
 incomingflow.search      = Search
+incomingflow.ungiveplace = Mark not given
 incomingflow.userdetails = User details
 
 infoview.back          = Back

code/MoyaWeb/src/fi/codecrew/moya/resources/i18n_fi.properties

@@ -418,8 +418,10 @@ importuser.file     = Tiedosto
 importuser.template = Malli
 
 incomingflow.barcode     = Viivakoodi
+incomingflow.giveplace   = Merkitse annetuksi
 incomingflow.multisearch = Monihaku
 incomingflow.search      = Etsi
+incomingflow.ungiveplace = Ei olekkaan annettu
 incomingflow.userdetails = K\u00E4ytt\u00E4j\u00E4n tiedot
 
 index.title = Etusivu

code/MoyaWeb/src/fi/codecrew/moya/web/flow/IncomingView.java

 package fi.codecrew.moya.web.flow;
 
 import java.util.ArrayList;
+import java.util.Calendar;
 import java.util.List;
 
 import javax.ejb.EJB;
 import javax.enterprise.context.ConversationScoped;
+import javax.faces.model.ListDataModel;
 import javax.inject.Inject;
 import javax.inject.Named;
 
@@ -16,11 +18,14 @@ import fi.codecrew.moya.beans.BarcodeBeanLocal;
 import fi.codecrew.moya.beans.CardTemplateBeanLocal;
 import fi.codecrew.moya.beans.PermissionBeanLocal;
 import fi.codecrew.moya.beans.PlaceBeanLocal;
+import fi.codecrew.moya.beans.PlaceGroupBeanLocal;
 import fi.codecrew.moya.beans.UserBeanLocal;
 import fi.codecrew.moya.enums.CardState;
+import fi.codecrew.moya.enums.apps.MapPermission;
 import fi.codecrew.moya.enums.apps.UserPermission;
 import fi.codecrew.moya.model.EventUser;
 import fi.codecrew.moya.model.GroupMembership;
+import fi.codecrew.moya.model.PlaceGroup;
 import fi.codecrew.moya.model.PrintedCard;
 import fi.codecrew.moya.util.UserSearchQuery;
 import fi.codecrew.moya.utilities.SearchResult;
@@ -64,11 +69,17 @@ public class IncomingView extends GenericCDIView {
 
 	@EJB
 	private UserBeanLocal userbean;
+	
+	@EJB
+	private transient PlaceGroupBeanLocal placegroupBean;
 
 	private String searchBarcode = "";
 
 	private EventUser searchMulti = null;
 
+	
+	ListDataModel<GroupMembership> memberlist = null;
+	
 	public void initView() {
 		super.beginConversation();
 	}
@@ -116,6 +127,7 @@ public class IncomingView extends GenericCDIView {
 	private boolean initialized = false;
 
 	public void initPrintCardView() {
+		memberlist = null;
 		if (!permbean.hasPermission(UserPermission.MODIFY) || namecontainer.getReaderId() == null || namecontainer.getReaderId() <= 0) {
 			super.navihandler.redirectNavigation("index.jsf");
 		}
@@ -179,6 +191,7 @@ public class IncomingView extends GenericCDIView {
 
 	public String selectUser() {
 		EventUser user = readerView.getUser();
+		memberlist = null;
 
 		if (user == null) {
 			logger.debug("got no user from barcode");
@@ -215,5 +228,37 @@ public class IncomingView extends GenericCDIView {
 	public void setSearchMulti(EventUser searchMulti) {
 		this.searchMulti = searchMulti;
 	}
+	
+	
+
+	public ListDataModel<GroupMembership> getGroupMemberships() {
+		memberlist = new ListDataModel<GroupMembership>(
+				placegroupBean.getMembershipsAndCreations(user));
+		return memberlist;
+	}
+	
+	
+
+	public String givePlace() {
+		GroupMembership row = memberlist.getRowData();
+		if (row != null) {
+			placegroupBean.markGrouMembershipEntered(row);
+			memberlist = null;
+		}
+		return null;
+	}
+	
+	public String ungivePlace() {
+		GroupMembership row = memberlist.getRowData();
+		if (row != null) {
+			placegroupBean.markGrouMembershipNotEntered(row);
+			memberlist = null;
+		}
+		return null;
+	}
+
+	
+	
+	
 
 }