bug-xxx

1 parent f53e97ea
Showing with 111 additions and 74 deletions
......@@ -23,6 +23,9 @@ public class FoodWaveBean implements FoodWaveBeanLocal {
@EJB
private FoodWaveTemplateFacade fwtFacade;
@EJB
private FoodWaveFacade foodWaveFacade;
@Override
@RolesAllowed(ShopPermission.S_MANAGE_PRODUCTS)
public List<FoodWaveTemplate> getTemplates() {
......@@ -46,9 +49,17 @@ public class FoodWaveBean implements FoodWaveBeanLocal {
@RolesAllowed("SHOP/READ")
public List<FoodWave> getOpenFoodWaves() {
return foodWaveFacade.getOpenFoodWaves();
}
public FoodWave findFoodwave(Integer foodwaveId) {
// TODO Auto-generated method stub
return null;
}
@Override
public FoodWaveTemplate saveTemplate(FoodWaveTemplate waveTemplate) {
// TODO Auto-generated method stub
return null;
}
}
......@@ -20,4 +20,5 @@ public interface FoodWaveBeanLocal {
List<FoodWave> getOpenFoodWaves();
public FoodWave findFoodwave(Integer foodwaveId);
}
......@@ -7,7 +7,7 @@ import javax.persistence.metamodel.ListAttribute;
import javax.persistence.metamodel.SingularAttribute;
import javax.persistence.metamodel.StaticMetamodel;
@Generated(value="Dali", date="2012-10-06T21:16:00.798+0300")
@Generated(value="Dali", date="2012-10-06T21:46:36.160+0300")
@StaticMetamodel(AccountEvent.class)
public class AccountEvent_ extends GenericEntity_ {
public static volatile SingularAttribute<AccountEvent, Boolean> cash;
......
......@@ -6,7 +6,7 @@ import javax.annotation.Generated;
import javax.persistence.metamodel.SingularAttribute;
import javax.persistence.metamodel.StaticMetamodel;
@Generated(value="Dali", date="2012-10-06T21:16:00.825+0300")
@Generated(value="Dali", date="2012-10-06T21:46:36.199+0300")
@StaticMetamodel(ActionLogMessageResponse.class)
public class ActionLogMessageResponse_ extends GenericEntity_ {
public static volatile SingularAttribute<ActionLogMessageResponse, Date> time;
......
......@@ -7,7 +7,7 @@ import javax.persistence.metamodel.ListAttribute;
import javax.persistence.metamodel.SingularAttribute;
import javax.persistence.metamodel.StaticMetamodel;
@Generated(value="Dali", date="2012-10-06T21:16:00.817+0300")
@Generated(value="Dali", date="2012-10-06T21:46:36.193+0300")
@StaticMetamodel(ActionLogMessage.class)
public class ActionLogMessage_ extends GenericEntity_ {
public static volatile SingularAttribute<ActionLogMessage, Date> time;
......
......@@ -4,7 +4,7 @@ import javax.annotation.Generated;
import javax.persistence.metamodel.SingularAttribute;
import javax.persistence.metamodel.StaticMetamodel;
@Generated(value="Dali", date="2012-10-06T21:16:00.832+0300")
@Generated(value="Dali", date="2012-10-06T21:46:36.204+0300")
@StaticMetamodel(ApplicationPermission.class)
public class ApplicationPermission_ extends GenericEntity_ {
public static volatile SingularAttribute<ApplicationPermission, String> application;
......
......@@ -5,7 +5,7 @@ import javax.annotation.Generated;
import javax.persistence.metamodel.SingularAttribute;
import javax.persistence.metamodel.StaticMetamodel;
@Generated(value="Dali", date="2012-10-06T21:16:00.847+0300")
@Generated(value="Dali", date="2012-10-06T21:46:36.216+0300")
@StaticMetamodel(BillLine.class)
public class BillLine_ extends GenericEntity_ {
public static volatile SingularAttribute<BillLine, Bill> bill;
......
......@@ -7,7 +7,7 @@ import javax.persistence.metamodel.ListAttribute;
import javax.persistence.metamodel.SingularAttribute;
import javax.persistence.metamodel.StaticMetamodel;
@Generated(value="Dali", date="2012-10-06T21:16:00.839+0300")
@Generated(value="Dali", date="2012-10-06T21:46:36.210+0300")
@StaticMetamodel(Bill.class)
public class Bill_ extends GenericEntity_ {
public static volatile SingularAttribute<Bill, LanEvent> event;
......
......@@ -5,7 +5,7 @@ import javax.persistence.metamodel.ListAttribute;
import javax.persistence.metamodel.SingularAttribute;
import javax.persistence.metamodel.StaticMetamodel;
@Generated(value="Dali", date="2012-10-06T21:16:00.854+0300")
@Generated(value="Dali", date="2012-10-06T21:46:36.222+0300")
@StaticMetamodel(CardTemplate.class)
public class CardTemplate_ extends GenericEntity_ {
public static volatile SingularAttribute<CardTemplate, LanEvent> event;
......
......@@ -5,7 +5,7 @@ import javax.annotation.Generated;
import javax.persistence.metamodel.SingularAttribute;
import javax.persistence.metamodel.StaticMetamodel;
@Generated(value="Dali", date="2012-10-06T21:16:00.876+0300")
@Generated(value="Dali", date="2012-10-06T21:46:36.238+0300")
@StaticMetamodel(CompoEntryFile.class)
public class CompoEntryFile_ extends GenericEntity_ {
public static volatile SingularAttribute<CompoEntryFile, String> mimeType;
......
......@@ -5,7 +5,7 @@ import javax.annotation.Generated;
import javax.persistence.metamodel.SingularAttribute;
import javax.persistence.metamodel.StaticMetamodel;
@Generated(value="Dali", date="2012-10-06T21:16:00.885+0300")
@Generated(value="Dali", date="2012-10-06T21:46:36.243+0300")
@StaticMetamodel(CompoEntryParticipant.class)
public class CompoEntryParticipant_ extends GenericEntity_ {
public static volatile SingularAttribute<CompoEntryParticipant, CompoEntry> entry;
......
......@@ -6,7 +6,7 @@ import javax.persistence.metamodel.ListAttribute;
import javax.persistence.metamodel.SingularAttribute;
import javax.persistence.metamodel.StaticMetamodel;
@Generated(value="Dali", date="2012-10-06T21:16:00.869+0300")
@Generated(value="Dali", date="2012-10-06T21:46:36.233+0300")
@StaticMetamodel(CompoEntry.class)
public class CompoEntry_ extends GenericEntity_ {
public static volatile SingularAttribute<CompoEntry, Compo> compo;
......
......@@ -6,7 +6,7 @@ import javax.persistence.metamodel.ListAttribute;
import javax.persistence.metamodel.SingularAttribute;
import javax.persistence.metamodel.StaticMetamodel;
@Generated(value="Dali", date="2012-10-06T21:16:00.861+0300")
@Generated(value="Dali", date="2012-10-06T21:46:36.227+0300")
@StaticMetamodel(Compo.class)
public class Compo_ extends GenericEntity_ {
public static volatile SingularAttribute<Compo, String> name;
......
......@@ -4,7 +4,7 @@ import javax.annotation.Generated;
import javax.persistence.metamodel.SingularAttribute;
import javax.persistence.metamodel.StaticMetamodel;
@Generated(value="Dali", date="2012-10-06T21:16:00.901+0300")
@Generated(value="Dali", date="2012-10-06T21:46:36.255+0300")
@StaticMetamodel(DiscountInstance.class)
public class DiscountInstance_ extends GenericEntity_ {
public static volatile SingularAttribute<DiscountInstance, AccountEvent> accountEvent;
......
......@@ -7,7 +7,7 @@ import javax.persistence.metamodel.ListAttribute;
import javax.persistence.metamodel.SingularAttribute;
import javax.persistence.metamodel.StaticMetamodel;
@Generated(value="Dali", date="2012-10-06T21:16:00.893+0300")
@Generated(value="Dali", date="2012-10-06T21:46:36.249+0300")
@StaticMetamodel(Discount.class)
public class Discount_ extends GenericEntity_ {
public static volatile SingularAttribute<Discount, LanEvent> event;
......
......@@ -3,7 +3,7 @@ package fi.insomnia.bortal.model;
import javax.annotation.Generated;
import javax.persistence.metamodel.StaticMetamodel;
@Generated(value="Dali", date="2012-10-06T21:16:00.908+0300")
@Generated(value="Dali", date="2012-10-06T21:46:36.260+0300")
@StaticMetamodel(EntityEquals.class)
public class EntityEquals_ {
}
......@@ -5,7 +5,7 @@ import javax.persistence.metamodel.ListAttribute;
import javax.persistence.metamodel.SingularAttribute;
import javax.persistence.metamodel.StaticMetamodel;
@Generated(value="Dali", date="2012-10-06T21:16:00.916+0300")
@Generated(value="Dali", date="2012-10-06T21:46:36.287+0300")
@StaticMetamodel(EventMap.class)
public class EventMap_ extends GenericEntity_ {
public static volatile SingularAttribute<EventMap, LanEvent> event;
......
......@@ -5,7 +5,7 @@ import javax.persistence.metamodel.ListAttribute;
import javax.persistence.metamodel.SingularAttribute;
import javax.persistence.metamodel.StaticMetamodel;
@Generated(value="Dali", date="2012-10-06T21:16:00.923+0300")
@Generated(value="Dali", date="2012-10-06T21:46:36.294+0300")
@StaticMetamodel(EventOrganiser.class)
public class EventOrganiser_ extends GenericEntity_ {
public static volatile SingularAttribute<EventOrganiser, String> organisation;
......
......@@ -6,7 +6,7 @@ import javax.persistence.metamodel.ListAttribute;
import javax.persistence.metamodel.SingularAttribute;
import javax.persistence.metamodel.StaticMetamodel;
@Generated(value="Dali", date="2012-10-06T21:16:00.931+0300")
@Generated(value="Dali", date="2012-10-06T21:46:36.299+0300")
@StaticMetamodel(EventUser.class)
public class EventUser_ extends GenericEntity_ {
public static volatile SingularAttribute<EventUser, User> user;
......
......@@ -5,7 +5,7 @@ import javax.persistence.metamodel.ListAttribute;
import javax.persistence.metamodel.SingularAttribute;
import javax.persistence.metamodel.StaticMetamodel;
@Generated(value="Dali", date="2012-10-06T21:16:00.948+0300")
@Generated(value="Dali", date="2012-10-06T21:46:36.310+0300")
@StaticMetamodel(FoodWaveTemplate.class)
public class FoodWaveTemplate_ extends GenericEntity_ {
public static volatile SingularAttribute<FoodWaveTemplate, LanEvent> event;
......
......@@ -6,7 +6,7 @@ import javax.persistence.metamodel.ListAttribute;
import javax.persistence.metamodel.SingularAttribute;
import javax.persistence.metamodel.StaticMetamodel;
@Generated(value="Dali", date="2012-10-06T21:16:00.940+0300")
@Generated(value="Dali", date="2012-10-06T21:46:36.305+0300")
@StaticMetamodel(FoodWave.class)
public class FoodWave_ extends GenericEntity_ {
public static volatile SingularAttribute<FoodWave, String> name;
......
......@@ -4,7 +4,7 @@ import javax.annotation.Generated;
import javax.persistence.metamodel.SingularAttribute;
import javax.persistence.metamodel.StaticMetamodel;
@Generated(value="Dali", date="2012-10-06T21:16:00.955+0300")
@Generated(value="Dali", date="2012-10-06T21:46:36.315+0300")
@StaticMetamodel(GenericEntity.class)
public class GenericEntity_ extends EntityEquals_ {
public static volatile SingularAttribute<GenericEntity, Integer> id;
......
......@@ -5,7 +5,7 @@ import javax.annotation.Generated;
import javax.persistence.metamodel.SingularAttribute;
import javax.persistence.metamodel.StaticMetamodel;
@Generated(value="Dali", date="2012-10-06T21:16:00.962+0300")
@Generated(value="Dali", date="2012-10-06T21:46:36.319+0300")
@StaticMetamodel(GroupMembership.class)
public class GroupMembership_ extends GenericEntity_ {
public static volatile SingularAttribute<GroupMembership, String> inviteToken;
......
......@@ -4,7 +4,7 @@ import javax.annotation.Generated;
import javax.persistence.metamodel.SingularAttribute;
import javax.persistence.metamodel.StaticMetamodel;
@Generated(value="Dali", date="2012-10-06T21:16:00.979+0300")
@Generated(value="Dali", date="2012-10-06T21:46:36.338+0300")
@StaticMetamodel(LanEventDomain.class)
public class LanEventDomain_ extends GenericEntity_ {
public static volatile SingularAttribute<LanEventDomain, String> domain;
......
......@@ -6,7 +6,7 @@ import javax.annotation.Generated;
import javax.persistence.metamodel.SingularAttribute;
import javax.persistence.metamodel.StaticMetamodel;
@Generated(value="Dali", date="2012-10-06T21:16:00.987+0300")
@Generated(value="Dali", date="2012-10-06T21:46:36.346+0300")
@StaticMetamodel(LanEventPrivateProperty.class)
public class LanEventPrivateProperty_ extends GenericEntity_ {
public static volatile SingularAttribute<LanEventPrivateProperty, EventOrganiser> eventorg;
......
......@@ -6,7 +6,7 @@ import javax.annotation.Generated;
import javax.persistence.metamodel.SingularAttribute;
import javax.persistence.metamodel.StaticMetamodel;
@Generated(value="Dali", date="2012-10-06T21:16:01.001+0300")
@Generated(value="Dali", date="2012-10-06T21:46:36.352+0300")
@StaticMetamodel(LanEventProperty.class)
public class LanEventProperty_ extends GenericEntity_ {
public static volatile SingularAttribute<LanEventProperty, EventOrganiser> eventorg;
......
......@@ -8,7 +8,7 @@ import javax.persistence.metamodel.ListAttribute;
import javax.persistence.metamodel.SingularAttribute;
import javax.persistence.metamodel.StaticMetamodel;
@Generated(value="Dali", date="2012-10-06T21:16:00.971+0300")
@Generated(value="Dali", date="2012-10-06T21:46:36.328+0300")
@StaticMetamodel(LanEvent.class)
public class LanEvent_ extends GenericEntity_ {
public static volatile SingularAttribute<LanEvent, Calendar> startTime;
......
......@@ -5,7 +5,7 @@ import javax.persistence.metamodel.ListAttribute;
import javax.persistence.metamodel.SingularAttribute;
import javax.persistence.metamodel.StaticMetamodel;
@Generated(value="Dali", date="2012-10-06T21:16:01.011+0300")
@Generated(value="Dali", date="2012-10-06T21:46:36.358+0300")
@StaticMetamodel(Location.class)
public class Location_ extends GenericEntity_ {
public static volatile SingularAttribute<Location, LanEvent> event;
......
......@@ -5,7 +5,7 @@ import javax.persistence.metamodel.ListAttribute;
import javax.persistence.metamodel.SingularAttribute;
import javax.persistence.metamodel.StaticMetamodel;
@Generated(value="Dali", date="2012-10-06T21:16:01.030+0300")
@Generated(value="Dali", date="2012-10-06T21:46:36.370+0300")
@StaticMetamodel(LogEntryType.class)
public class LogEntryType_ extends GenericEntity_ {
public static volatile SingularAttribute<LogEntryType, String> name;
......
......@@ -5,7 +5,7 @@ import javax.annotation.Generated;
import javax.persistence.metamodel.SingularAttribute;
import javax.persistence.metamodel.StaticMetamodel;
@Generated(value="Dali", date="2012-10-06T21:16:01.021+0300")
@Generated(value="Dali", date="2012-10-06T21:46:36.364+0300")
@StaticMetamodel(LogEntry.class)
public class LogEntry_ extends GenericEntity_ {
public static volatile SingularAttribute<LogEntry, LanEvent> parentEvent;
......
......@@ -5,7 +5,7 @@ import javax.persistence.metamodel.ListAttribute;
import javax.persistence.metamodel.SingularAttribute;
import javax.persistence.metamodel.StaticMetamodel;
@Generated(value="Dali", date="2012-10-06T21:16:01.058+0300")
@Generated(value="Dali", date="2012-10-06T21:46:36.380+0300")
@StaticMetamodel(MenuNavigation.class)
public class MenuNavigation_ extends GenericEntity_ {
public static volatile SingularAttribute<MenuNavigation, LanEvent> event;
......
......@@ -5,7 +5,7 @@ import javax.persistence.metamodel.ListAttribute;
import javax.persistence.metamodel.SingularAttribute;
import javax.persistence.metamodel.StaticMetamodel;
@Generated(value="Dali", date="2012-10-06T21:16:01.045+0300")
@Generated(value="Dali", date="2012-10-06T21:46:36.375+0300")
@StaticMetamodel(Menuitem.class)
public class Menuitem_ extends GenericEntity_ {
public static volatile SingularAttribute<Menuitem, String> url;
......
......@@ -5,7 +5,7 @@ import javax.persistence.metamodel.ListAttribute;
import javax.persistence.metamodel.SingularAttribute;
import javax.persistence.metamodel.StaticMetamodel;
@Generated(value="Dali", date="2012-10-06T21:16:01.084+0300")
@Generated(value="Dali", date="2012-10-06T21:46:36.390+0300")
@StaticMetamodel(NewsGroup.class)
public class NewsGroup_ extends GenericEntity_ {
public static volatile SingularAttribute<NewsGroup, LanEvent> event;
......
......@@ -5,7 +5,7 @@ import javax.annotation.Generated;
import javax.persistence.metamodel.SingularAttribute;
import javax.persistence.metamodel.StaticMetamodel;
@Generated(value="Dali", date="2012-10-06T21:16:01.071+0300")
@Generated(value="Dali", date="2012-10-06T21:46:36.385+0300")
@StaticMetamodel(News.class)
public class News_ extends GenericEntity_ {
public static volatile SingularAttribute<News, String> title;
......
......@@ -5,7 +5,7 @@ import javax.persistence.metamodel.ListAttribute;
import javax.persistence.metamodel.SingularAttribute;
import javax.persistence.metamodel.StaticMetamodel;
@Generated(value="Dali", date="2012-10-06T21:16:01.094+0300")
@Generated(value="Dali", date="2012-10-06T21:46:36.395+0300")
@StaticMetamodel(OrgRole.class)
public class OrgRole_ extends GenericEntity_ {
public static volatile SingularAttribute<OrgRole, String> name;
......
......@@ -5,7 +5,7 @@ import javax.annotation.Generated;
import javax.persistence.metamodel.SingularAttribute;
import javax.persistence.metamodel.StaticMetamodel;
@Generated(value="Dali", date="2012-10-06T21:16:01.106+0300")
@Generated(value="Dali", date="2012-10-06T21:46:36.401+0300")
@StaticMetamodel(PageContent.class)
public class PageContent_ extends GenericEntity_ {
public static volatile SingularAttribute<PageContent, SitePage> sitepage;
......
......@@ -6,7 +6,7 @@ import javax.persistence.metamodel.ListAttribute;
import javax.persistence.metamodel.SingularAttribute;
import javax.persistence.metamodel.StaticMetamodel;
@Generated(value="Dali", date="2012-10-06T21:16:01.130+0300")
@Generated(value="Dali", date="2012-10-06T21:46:36.413+0300")
@StaticMetamodel(PlaceGroup.class)
public class PlaceGroup_ extends GenericEntity_ {
public static volatile SingularAttribute<PlaceGroup, Calendar> created;
......
......@@ -5,7 +5,7 @@ import javax.annotation.Generated;
import javax.persistence.metamodel.SingularAttribute;
import javax.persistence.metamodel.StaticMetamodel;
@Generated(value="Dali", date="2012-10-06T21:16:01.117+0300")
@Generated(value="Dali", date="2012-10-06T21:46:36.407+0300")
@StaticMetamodel(Place.class)
public class Place_ extends GenericEntity_ {
public static volatile SingularAttribute<Place, String> description;
......
......@@ -4,7 +4,7 @@ import javax.annotation.Generated;
import javax.persistence.metamodel.SingularAttribute;
import javax.persistence.metamodel.StaticMetamodel;
@Generated(value="Dali", date="2012-10-06T21:16:01.174+0300")
@Generated(value="Dali", date="2012-10-06T21:46:36.424+0300")
@StaticMetamodel(PollAnswer.class)
public class PollAnswer_ extends GenericEntity_ {
public static volatile SingularAttribute<PollAnswer, String> answerText;
......
......@@ -5,7 +5,7 @@ import javax.persistence.metamodel.ListAttribute;
import javax.persistence.metamodel.SingularAttribute;
import javax.persistence.metamodel.StaticMetamodel;
@Generated(value="Dali", date="2012-10-06T21:16:01.185+0300")
@Generated(value="Dali", date="2012-10-06T21:46:36.430+0300")
@StaticMetamodel(PollQuestion.class)
public class PollQuestion_ extends GenericEntity_ {
public static volatile SingularAttribute<PollQuestion, Integer> characters;
......
......@@ -6,7 +6,7 @@ import javax.persistence.metamodel.ListAttribute;
import javax.persistence.metamodel.SingularAttribute;
import javax.persistence.metamodel.StaticMetamodel;
@Generated(value="Dali", date="2012-10-06T21:16:01.144+0300")
@Generated(value="Dali", date="2012-10-06T21:46:36.419+0300")
@StaticMetamodel(Poll.class)
public class Poll_ extends GenericEntity_ {
public static volatile SingularAttribute<Poll, LanEvent> event;
......
......@@ -5,7 +5,7 @@ import javax.persistence.metamodel.ListAttribute;
import javax.persistence.metamodel.SingularAttribute;
import javax.persistence.metamodel.StaticMetamodel;
@Generated(value="Dali", date="2012-10-06T21:16:01.198+0300")
@Generated(value="Dali", date="2012-10-06T21:46:36.436+0300")
@StaticMetamodel(PossibleAnswer.class)
public class PossibleAnswer_ extends GenericEntity_ {
public static volatile SingularAttribute<PossibleAnswer, String> answer;
......
......@@ -6,7 +6,7 @@ import javax.persistence.metamodel.ListAttribute;
import javax.persistence.metamodel.SingularAttribute;
import javax.persistence.metamodel.StaticMetamodel;
@Generated(value="Dali", date="2012-10-06T21:16:01.210+0300")
@Generated(value="Dali", date="2012-10-06T21:46:36.442+0300")
@StaticMetamodel(PrintedCard.class)
public class PrintedCard_ extends GenericEntity_ {
public static volatile SingularAttribute<PrintedCard, LanEvent> event;
......
......@@ -6,7 +6,7 @@ import javax.persistence.metamodel.ListAttribute;
import javax.persistence.metamodel.SingularAttribute;
import javax.persistence.metamodel.StaticMetamodel;
@Generated(value="Dali", date="2012-10-06T21:16:01.243+0300")
@Generated(value="Dali", date="2012-10-06T21:46:36.460+0300")
@StaticMetamodel(ProductLimitation.class)
public class ProductLimitation_ extends GenericEntity_ {
public static volatile SingularAttribute<ProductLimitation, ProductLimitationType> type;
......
......@@ -7,7 +7,7 @@ import javax.persistence.metamodel.SetAttribute;
import javax.persistence.metamodel.SingularAttribute;
import javax.persistence.metamodel.StaticMetamodel;
@Generated(value="Dali", date="2012-10-06T04:04:21.088+0300")
@Generated(value="Dali", date="2012-10-06T21:53:06.901+0300")
@StaticMetamodel(Product.class)
public class Product_ extends GenericEntity_ {
public static volatile SingularAttribute<Product, LanEvent> event;
......@@ -19,10 +19,10 @@ public class Product_ extends GenericEntity_ {
public static volatile SetAttribute<Product, ProductFlag> productFlags;
public static volatile SingularAttribute<Product, Role> provides;
public static volatile ListAttribute<Product, Place> places;
public static volatile ListAttribute<Product, ProductLimitation> productLimits;
public static volatile ListAttribute<Product, AccountEvent> accountEvents;
public static volatile ListAttribute<Product, Discount> discounts;
public static volatile SingularAttribute<Product, BigDecimal> vat;
public static volatile SingularAttribute<Product, String> unitName;
public static volatile ListAttribute<Product, FoodWaveTemplate> foodWaveTemplates;
public static volatile ListAttribute<Product, ProductLimitation> productLimits;
}
......@@ -5,7 +5,7 @@ import javax.annotation.Generated;
import javax.persistence.metamodel.SingularAttribute;
import javax.persistence.metamodel.StaticMetamodel;
@Generated(value="Dali", date="2012-10-06T21:16:01.270+0300")
@Generated(value="Dali", date="2012-10-06T21:46:36.475+0300")
@StaticMetamodel(ReaderEvent.class)
public class ReaderEvent_ extends GenericEntity_ {
public static volatile SingularAttribute<ReaderEvent, Calendar> time;
......
......@@ -6,9 +6,10 @@ import javax.persistence.metamodel.ListAttribute;
import javax.persistence.metamodel.SingularAttribute;
import javax.persistence.metamodel.StaticMetamodel;
@Generated(value="Dali", date="2012-10-06T04:04:21.120+0300")
@Generated(value="Dali", date="2012-10-06T21:53:47.354+0300")
@StaticMetamodel(Reader.class)
public class Reader_ extends GenericEntity_ {
public static volatile SingularAttribute<Reader, ReaderType> type;
public static volatile SingularAttribute<Reader, LanEvent> event;
public static volatile SingularAttribute<Reader, Integer> gamepoints;
public static volatile SingularAttribute<Reader, Integer> maxEvents;
......@@ -20,5 +21,4 @@ public class Reader_ extends GenericEntity_ {
public static volatile SingularAttribute<Reader, Integer> mapX;
public static volatile SingularAttribute<Reader, Integer> mapY;
public static volatile ListAttribute<Reader, ReaderEvent> events;
public static volatile SingularAttribute<Reader, ReaderType> type;
}
......@@ -5,7 +5,7 @@ import javax.persistence.metamodel.ListAttribute;
import javax.persistence.metamodel.SingularAttribute;
import javax.persistence.metamodel.StaticMetamodel;
@Generated(value="Dali", date="2012-10-06T21:16:01.287+0300")
@Generated(value="Dali", date="2012-10-06T21:46:36.481+0300")
@StaticMetamodel(Role.class)
public class Role_ extends GenericEntity_ {
public static volatile SingularAttribute<Role, String> name;
......
......@@ -5,7 +5,7 @@ import javax.persistence.metamodel.ListAttribute;
import javax.persistence.metamodel.SingularAttribute;
import javax.persistence.metamodel.StaticMetamodel;
@Generated(value="Dali", date="2012-10-06T21:16:01.321+0300")
@Generated(value="Dali", date="2012-10-06T21:46:36.497+0300")
@StaticMetamodel(SitePage.class)
public class SitePage_ extends GenericEntity_ {
public static volatile SingularAttribute<SitePage, LanEvent> event;
......
......@@ -5,7 +5,7 @@ import javax.annotation.Generated;
import javax.persistence.metamodel.SingularAttribute;
import javax.persistence.metamodel.StaticMetamodel;
@Generated(value="Dali", date="2012-10-06T21:16:01.349+0300")
@Generated(value="Dali", date="2012-10-06T21:46:36.512+0300")
@StaticMetamodel(UserImage.class)
public class UserImage_ extends GenericEntity_ {
public static volatile SingularAttribute<UserImage, Calendar> uploaded;
......
......@@ -4,7 +4,7 @@ import javax.annotation.Generated;
import javax.persistence.metamodel.SingularAttribute;
import javax.persistence.metamodel.StaticMetamodel;
@Generated(value="Dali", date="2012-10-06T21:16:01.362+0300")
@Generated(value="Dali", date="2012-10-06T21:46:36.520+0300")
@StaticMetamodel(UserNote.class)
public class UserNote_ extends GenericEntity_ {
public static volatile SingularAttribute<UserNote, EventUser> user;
......
......@@ -8,7 +8,7 @@ import javax.persistence.metamodel.ListAttribute;
import javax.persistence.metamodel.SingularAttribute;
import javax.persistence.metamodel.StaticMetamodel;
@Generated(value="Dali", date="2012-10-06T21:16:01.338+0300")
@Generated(value="Dali", date="2012-10-06T21:46:36.503+0300")
@StaticMetamodel(User.class)
public class User_ extends GenericEntity_ {
public static volatile SingularAttribute<User, Calendar> created;
......
......@@ -5,7 +5,7 @@ import javax.annotation.Generated;
import javax.persistence.metamodel.SingularAttribute;
import javax.persistence.metamodel.StaticMetamodel;
@Generated(value="Dali", date="2012-10-06T21:16:01.372+0300")
@Generated(value="Dali", date="2012-10-06T21:46:36.527+0300")
@StaticMetamodel(Vote.class)
public class Vote_ extends GenericEntity_ {
public static volatile SingularAttribute<Vote, Integer> score;
......
......@@ -6,7 +6,7 @@ import javax.annotation.Generated;
import javax.persistence.metamodel.SingularAttribute;
import javax.persistence.metamodel.StaticMetamodel;
@Generated(value="Dali", date="2012-10-06T21:16:01.296+0300")
@Generated(value="Dali", date="2012-10-06T21:46:36.485+0300")
@StaticMetamodel(SalesEntity.class)
public class SalesEntity_ extends GenericEntity_ {
public static volatile SingularAttribute<SalesEntity, String> certificate;
......
......@@ -7,7 +7,7 @@ import javax.persistence.metamodel.ListAttribute;
import javax.persistence.metamodel.SingularAttribute;
import javax.persistence.metamodel.StaticMetamodel;
@Generated(value="Dali", date="2012-10-06T21:16:01.311+0300")
@Generated(value="Dali", date="2012-10-06T21:46:36.491+0300")
@StaticMetamodel(Salespoint.class)
public class Salespoint_ extends GenericEntity_ {
public static volatile SingularAttribute<Salespoint, LanEvent> event;
......
......@@ -7,6 +7,7 @@ import javax.inject.Named;
import fi.insomnia.bortal.beans.FoodWaveBeanLocal;
import fi.insomnia.bortal.enums.apps.ShopPermission;
import fi.insomnia.bortal.model.FoodWave;
import fi.insomnia.bortal.model.FoodWaveTemplate;
import fi.insomnia.bortal.web.cdiview.GenericCDIView;
......@@ -16,47 +17,51 @@ public class FoodWaveView extends GenericCDIView {
private static final long serialVersionUID = 7281708393927365603L;
@EJB
private FoodWaveBeanLocal foodwaveBean;
private FoodWaveBeanLocal foodWaveBean;
private ListDataModel<FoodWaveTemplate> templates;
private FoodWaveTemplate template;
public void initTemplateList()
{
if (super.requirePermissions(ShopPermission.MANAGE_PRODUCTS))
{
setTemplates(new ListDataModel<FoodWaveTemplate>(foodwaveBean.getTemplates()));
private ListDataModel<FoodWave> foodWaves;
private FoodWave selectedFoodWave = null;
public void initTemplateList() {
if (super.requirePermissions(ShopPermission.MANAGE_PRODUCTS)) {
setTemplates(new ListDataModel<FoodWaveTemplate>(
foodWaveBean.getTemplates()));
super.beginConversation();
}
}
public void initEditTemplate()
{
public void initEditTemplate() {
if (super.requirePermissions(ShopPermission.MANAGE_PRODUCTS) && template == null)
{
if (super.requirePermissions(ShopPermission.MANAGE_PRODUCTS)
&& template == null) {
super.beginConversation();
}
}
public void initCreateTemplate()
{
if (super.requirePermissions(ShopPermission.MANAGE_PRODUCTS) && template == null)
{
public void initCreateTemplate() {
if (super.requirePermissions(ShopPermission.MANAGE_PRODUCTS)
&& template == null) {
setTemplate(new FoodWaveTemplate());
super.beginConversation();
}
}
public String editTemplate()
{
public void initUserFoodWaveList() {
this.foodWaves = new ListDataModel<FoodWave>(
foodWaveBean.getOpenFoodWaves());
}
public String editTemplate() {
setTemplate(getTemplates().getRowData());
return "/foodadmin/editTemplate";
}
public String saveTemplate()
{
setTemplate(foodwaveBean.saveOrCreateTemplate(getTemplate()));
public String saveTemplate() {
setTemplate(foodWaveBean.saveOrCreateTemplate(getTemplate()));
return null;
}
......@@ -76,4 +81,24 @@ public class FoodWaveView extends GenericCDIView {
this.templates = templates;
}
public ListDataModel<FoodWave> getFoodWaves() {
return foodWaves;
}
public String selectFoodWave() {
if (foodWaves.isRowAvailable()) {
setSelectedFoodWave(foodWaves.getRowData());
}
return "foorwave/listProducts";
}
public FoodWave getSelectedFoodWave() {
return selectedFoodWave;
}
public void setSelectedFoodWave(FoodWave selectedFoodWave) {
this.selectedFoodWave = selectedFoodWave;
}
}
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!