Add card status setting to user traversing

code/MoyaWeb/WebContent/useradmin/userCartShow.xhtml

@@ -19,10 +19,29 @@
 				<h:outputText value="#{userCartView.current+1}" /> / <h:outputText value="#{userCartView.userCartSize}" />
 				<h:outputText value="#{userCartView.current+1}" /> / <h:outputText value="#{userCartView.userCartSize}" />
 				<h:commandButton action="#{userCartView.prev()}" value="#{i18n['usercart.prev']}" rendered="#{userCartView.current > 0}" />
 				<h:commandButton action="#{userCartView.prev()}" value="#{i18n['usercart.prev']}" rendered="#{userCartView.current > 0}" />
 				<h:commandButton action="#{userCartView.removeCurrent()}" value="#{i18n['usercart.removeCurrent']}" />
 				<h:commandButton action="#{userCartView.removeCurrent()}" value="#{i18n['usercart.removeCurrent']}" />
-				<h:commandButton action="#{userCartView.next()}" value="#{i18n['usercart.next']}" rendered="#{userCartView.userCartSize > (userCartView.current+1)}" /></h:form>
+				<h:commandButton action="#{userCartView.next()}" value="#{i18n['usercart.next']}" rendered="#{userCartView.userCartSize > (userCartView.current+1)}" />
+
+			</h:form>
+
+			<ui:fragment rendered="#{userView.hasPrintedCard}">
+				<h2>Card</h2>
+				<h:form>
+					<p:panelGrid columns="2">
+						<h:outputText value="#{i18n[card.name]}" />
+						<h:outputText value="#{userView.printedCard.template.name}" />
+
+						<h:selectOneMenu value="#{userView.printedCard.cardState}">
+							<f:selectItems value="#{userView.printedCardStates}" />
+						</h:selectOneMenu>
+						<h:commandButton action="#{userView.setCardState()}" value="#{i18n['printedCard.setState']}" />
+
+					</p:panelGrid>
+
+				</h:form>
+			</ui:fragment>
 
 
 			<h:link outcome="/card/massprint" value="Mass Print">
 			<h:link outcome="/card/massprint" value="Mass Print">
-					<f:param name="cid" value="#{javax.enterprise.context.conversation.id}"/>
+				<f:param name="cid" value="#{javax.enterprise.context.conversation.id}" />
 			</h:link>
 			</h:link>
 
 
 
 

code/MoyaWeb/src/fi/codecrew/moya/web/cdiview/user/UserCartView.java

@@ -142,6 +142,7 @@ public class UserCartView extends GenericCDIView {
 		if (u != null) {
 		if (u != null) {
 			userview.setUserid(u.getUser().getId());
 			userview.setUserid(u.getUser().getId());
 			userview.setUser(null);
 			userview.setUser(null);
+			userview.setPrintedCard(null);
 			userview.initView();
 			userview.initView();
 		}
 		}
 	}
 	}

code/MoyaWeb/src/fi/codecrew/moya/web/cdiview/user/UserView.java

@@ -264,7 +264,7 @@ public class UserView extends GenericCDIView {
 		if (user != null && userid != null && !user.getId().equals(userid)) {
 		if (user != null && userid != null && !user.getId().equals(userid)) {
 			user = null;
 			user = null;
 		}
 		}
-
+		printedCard = null;
 		if (super.requirePermissions(UserPermission.VIEW_SELF) && user == null) {
 		if (super.requirePermissions(UserPermission.VIEW_SELF) && user == null) {
 			getSelectedUser();
 			getSelectedUser();
 			canSave = getCurrentUser().equals(user) || permbean.hasPermission(UserPermission.MODIFY);
 			canSave = getCurrentUser().equals(user) || permbean.hasPermission(UserPermission.MODIFY);
@@ -325,6 +325,11 @@ public class UserView extends GenericCDIView {
 		return permbean.isCurrentUser(user);
 		return permbean.isCurrentUser(user);
 	}
 	}
 
 
+	public boolean isHasPrintedCard()
+	{
+		return getPrintedCard() != null;
+	}
+
 	public String setCardState()
 	public String setCardState()
 	{
 	{
 		printedCard = cardBean.saveCard(printedCard);
 		printedCard = cardBean.saveCard(printedCard);