Skip to content

Max Mecklin / Moya

Go to a project
Commit 4fcdefa5 by Tuukka Kivilahti
Options

only show own stuff in cardlessINcomingView

1 parent 23c49195
Inline Side-by-side
Showing with 18 additions and 12 deletions
code/moya-web/WebContent/info/cardlessIncoming.xhtml
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
<h:form id="membershipForm"> <h:form id="membershipForm">
<p:fieldset id="groupMembershiSummary" legend="#{i18n['incomingflow.placesummary']}" toggleable="true" collapsed="#{fieldsetView.isCollapsed(component.id)}"> <p:fieldset id="groupMembershiSummary" legend="#{i18n['incomingflow.placesummary']}" toggleable="true" collapsed="#{fieldsetView.isCollapsed(component.id)}">
<p:ajax event="toggle" listener="#{fieldsetView.handleToggle}" /> <p:ajax event="toggle" listener="#{fieldsetView.handleToggle}" />
<p:dataTable value="#{cardlessIncomingView.placeSummaries}" var="placeSummary" rowStyleClass="#{(placeSummary.left == 0)? ((placeSummary.count == 0)?'expired':'success'):''}"> <p:dataTable value="#{cardlessIncomingView.placeSummaries}" var="placeSummary" rowStyleClass="#{(placeSummary.left == 0)? ((placeSummary.count == 0)?'expired':'greenBackground'):''}">
<p:column> <p:column>
<f:facet name="header"> <f:facet name="header">
<p:outputLabel value="#{i18n['placegroupview.reservationProduct']}" /> <p:outputLabel value="#{i18n['placegroupview.reservationProduct']}" />
...@@ -64,7 +64,7 @@ ...@@ -64,7 +64,7 @@
<p:fieldset id="groupMembershipList" rendered="#{!empty cardlessIncomingView.groupMemberships}" legend="#{i18n['incomingflow.groupmemberships']}" toggleable="true" collapsed="#{fieldsetView.isCollapsed(component.id)}"> <p:fieldset id="groupMembershipList" rendered="#{!empty cardlessIncomingView.groupMemberships}" legend="#{i18n['incomingflow.groupmemberships']}" toggleable="true" collapsed="#{fieldsetView.isCollapsed(component.id)}">
<p:ajax event="toggle" listener="#{fieldsetView.handleToggle}" /> <p:ajax event="toggle" listener="#{fieldsetView.handleToggle}" />
<p:dataTable value="#{cardlessIncomingView.groupMemberships}" var="member" rowStyleClass="#{member.enteredEvent != null ? 'success':''}"> <p:dataTable value="#{cardlessIncomingView.groupMemberships}" var="member" rowStyleClass="#{member.enteredEvent != null ? 'greenBackground':''}">
<p:column> <p:column>
<f:facet name="header"> <f:facet name="header">
......
code/moya-web/WebContent/resources/templates/custom_components.css
...@@ -195,6 +195,10 @@ a.shopItem:active { ...@@ -195,6 +195,10 @@ a.shopItem:active {
color: #006600; color: #006600;
} }
.greenBackground {
background-color: #006600;
}
.lectureCalendar, .lectureCalendar,
.lectureCalendarParticipating, .lectureCalendarParticipating,
.lectureCalendarDisabled, .lectureCalendarDisabled,
......
code/moya-web/src/main/java/fi/codecrew/moya/web/flow/CardlessIncomingView.java
...@@ -70,6 +70,9 @@ public class CardlessIncomingView extends GenericCDIView { ...@@ -70,6 +70,9 @@ public class CardlessIncomingView extends GenericCDIView {
@EJB @EJB
private ProductBeanLocal productBean; private ProductBeanLocal productBean;
@EJB
private TicketBeanLocal ticketBean;
private ListDataModel<GroupMembership> memberlist = null; private ListDataModel<GroupMembership> memberlist = null;
...@@ -102,7 +105,8 @@ public class CardlessIncomingView extends GenericCDIView { ...@@ -102,7 +105,8 @@ public class CardlessIncomingView extends GenericCDIView {
} }
public ListDataModel<GroupMembership> getGroupMemberships() { public ListDataModel<GroupMembership> getGroupMemberships() {
memberlist = new ListDataModel<>(placegroupBean.getMembershipsAndCreations(userview.getSelectedUser())); memberlist = new ListDataModel<>(ticketBean.findMembershipPrintlistForUser(userview.getSelectedUser()));
return memberlist; return memberlist;
} }
...@@ -118,7 +122,7 @@ public class CardlessIncomingView extends GenericCDIView { ...@@ -118,7 +122,7 @@ public class CardlessIncomingView extends GenericCDIView {
public List<ProductSummaryWrapper> getPlaceSummaries() { public List<ProductSummaryWrapper> getPlaceSummaries() {
List<Product> allPlaceProducts = productBean.getPlaceProducts(); List<Product> allPlaceProducts = productBean.getPlaceProducts();
List<GroupMembership> groupMemberships = placegroupBean.getMembershipsAndCreations(userview.getSelectedUser()); List<GroupMembership> groupMemberships = ticketBean.findMembershipPrintlistForUser(userview.getSelectedUser());
List<ProductSummaryWrapper> retarray = new ArrayList<>(); List<ProductSummaryWrapper> retarray = new ArrayList<>();
...@@ -160,7 +164,7 @@ public class CardlessIncomingView extends GenericCDIView { ...@@ -160,7 +164,7 @@ public class CardlessIncomingView extends GenericCDIView {
public void giveEverything() { public void giveEverything() {
List<GroupMembership> memberships = placegroupBean.getMembershipsAndCreations(userview.getSelectedUser()); List<GroupMembership> memberships = ticketBean.findMembershipPrintlistForUser(userview.getSelectedUser());
int count = 0; int count = 0;
for(GroupMembership gm : memberships) { for(GroupMembership gm : memberships) {
......
code/moya-web/src/main/java/fi/codecrew/moya/web/flow/IncomingView.java
...@@ -29,15 +29,10 @@ import javax.inject.Inject; ...@@ -29,15 +29,10 @@ import javax.inject.Inject;
import javax.inject.Named; import javax.inject.Named;
import javax.json.JsonObject; import javax.json.JsonObject;
import fi.codecrew.moya.beans.*;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
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.CardState;
import fi.codecrew.moya.enums.apps.UserPermission; import fi.codecrew.moya.enums.apps.UserPermission;
import fi.codecrew.moya.model.CardCode; import fi.codecrew.moya.model.CardCode;
...@@ -99,6 +94,9 @@ public class IncomingView extends GenericCDIView { ...@@ -99,6 +94,9 @@ public class IncomingView extends GenericCDIView {
@EJB @EJB
private CardTemplateBeanLocal cardTemplateBean; private CardTemplateBeanLocal cardTemplateBean;
@EJB
private TicketBeanLocal ticketBean;
// private String searchBarcode = ""; // private String searchBarcode = "";
private ListDataModel<GroupMembership> memberlist = null; private ListDataModel<GroupMembership> memberlist = null;
...@@ -274,7 +272,7 @@ public class IncomingView extends GenericCDIView { ...@@ -274,7 +272,7 @@ public class IncomingView extends GenericCDIView {
} }
public ListDataModel<GroupMembership> getGroupMemberships() { public ListDataModel<GroupMembership> getGroupMemberships() {
memberlist = new ListDataModel<GroupMembership>(placegroupBean.getMembershipsAndCreations(userview.getSelectedUser())); memberlist = new ListDataModel<GroupMembership>(ticketBean.findMembershipPrintlistForUser(userview.getSelectedUser()));
return memberlist; return memberlist;
} }
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!