Skip to content

Max Mecklin / Moya

Go to a project
Commit 49accc3b by Juho Juopperi
Options

user cart ui improvements

1 parent 59302d14
Inline Side-by-side
Showing with 18 additions and 7 deletions
code/moya-web/WebContent/useradmin/userCartShow.xhtml
...@@ -13,14 +13,23 @@ ...@@ -13,14 +13,23 @@
<ui:define name="title"> <ui:define name="title">
<h1>#{i18n['user.edit.title']}</h1> <h1>#{i18n['user.edit.title']}</h1>
</ui:define> </ui:define>
<ui:define name="content">
<ui:define name="content">
<h:form> <h:form>
<p:toolbar>
<f:facet name="left">
<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}" /> <span class="ui-separator"><span class="ui-icon ui-icon-grip-dotted-vertical" /></span>
<h:commandButton action="#{userCartView.removeCurrent()}" value="#{i18n['usercart.removeCurrent']}" /> <p:commandButton action="#{userCartView.prev()}" value="#{i18n['usercart.prev']}"
<h:commandButton action="#{userCartView.next()}" value="#{i18n['usercart.next']}" rendered="#{userCartView.userCartSize > (userCartView.current+1)}" /> icon="ui-icon-circle-arrow-w" ajax="false"
rendered="#{userCartView.current > 0}" />
<p:commandButton action="#{userCartView.removeCurrent()}" value="#{i18n['usercart.removeCurrent']}"
icon="ui-icon-close" ajax="false"/>
<p:commandButton action="#{userCartView.next()}" value="#{i18n['usercart.next']}"
icon="ui-icon-circle-arrow-e" ajax="false"
rendered="#{userCartView.userCartSize > (userCartView.current+1)}" />
</f:facet>
</p:toolbar>
</h:form> </h:form>
<ui:fragment rendered="#{userView.hasPrintedCard}"> <ui:fragment rendered="#{userView.hasPrintedCard}">
...@@ -40,16 +49,18 @@ ...@@ -40,16 +49,18 @@
</h:form> </h:form>
</ui:fragment> </ui:fragment>
<p>
<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>
</p>
<p> <p>
<h:link outcome="/useradmin/changePassword" value="#{i18n['submenu.user.changePassword']}"> <h:link outcome="/useradmin/changePassword" value="#{i18n['submenu.user.changePassword']}">
<f:param name="userid" value="#{userView.user.user.id}" /> <f:param name="userid" value="#{userView.user.user.id}" />
</h:link> </h:link>
</p> </p>
<users:edit id="useredit" commitaction="#{userCartView.saveUser()}" commitvalue="#{i18n['user.save']}" /> <users:edit id="useredit" commitaction="#{userCartView.saveUser()}" commitvalue="#{i18n['user.save']}" />
<h:form id="roleform" rendered="#{roleView.canReadRoles}"> <h:form id="roleform" rendered="#{roleView.canReadRoles}">
......
code/moya-web/src/main/java/fi/codecrew/moya/web/cdiview/user/UserView.java
...@@ -661,6 +661,6 @@ public class UserView extends GenericCDIView { ...@@ -661,6 +661,6 @@ public class UserView extends GenericCDIView {
public void cardStateChangeListener(ValueChangeEvent valueChange) { public void cardStateChangeListener(ValueChangeEvent valueChange) {
logger.debug("PrintedCard state changed from {} to {}", valueChange.getOldValue(), valueChange.getNewValue()); logger.debug("PrintedCard state changed from {} to {}", valueChange.getOldValue(), valueChange.getNewValue());
cardBean.saveCard(printedCard); setCardState();
} }
} }
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!