Skip to content

Max Mecklin / Moya

Go to a project
Commit b79c2f77 by Juho Juopperi
Options

Merge branch 'CardPrintFix' into 'master' 

Card print fix

Livin korttipohjakorjaukset

See merge request !247
2 parents db5d5f50 b2861f37
Inline Side-by-side
Showing with 291 additions and 1185 deletions
code/LanBortalDatabase/src/fi/insomnia/bortal/model/AccountEvent_.java deleted 100644 → 0
package fi.insomnia.bortal.model;
import java.math.BigDecimal;
import java.util.Calendar;
import javax.annotation.Generated;
import javax.persistence.metamodel.ListAttribute;
import javax.persistence.metamodel.SingularAttribute;
import javax.persistence.metamodel.StaticMetamodel;
@Generated(value="Dali", date="2012-10-27T16:07:46.034+0300")
@StaticMetamodel(AccountEvent.class)
public class AccountEvent_ extends GenericEntity_ {
public static volatile SingularAttribute<AccountEvent, Boolean> cash;
public static volatile SingularAttribute<AccountEvent, BigDecimal> unitPrice;
public static volatile SingularAttribute<AccountEvent, BigDecimal> quantity;
public static volatile SingularAttribute<AccountEvent, Calendar> eventTime;
public static volatile SingularAttribute<AccountEvent, Calendar> delivered;
public static volatile SingularAttribute<AccountEvent, BigDecimal> deliveredCount;
public static volatile SingularAttribute<AccountEvent, FoodWave> foodWave;
public static volatile SingularAttribute<AccountEvent, Product> product;
public static volatile SingularAttribute<AccountEvent, EventUser> user;
public static volatile SingularAttribute<AccountEvent, EventUser> seller;
public static volatile ListAttribute<AccountEvent, DiscountInstance> discountInstances;
public static volatile SingularAttribute<AccountEvent, Bill> bill;
public static volatile SingularAttribute<AccountEvent, String> description;
}
code/LanBortalDatabase/src/fi/insomnia/bortal/model/ActionLogMessageResponse_.java deleted 100644 → 0
package fi.insomnia.bortal.model;
import fi.insomnia.bortal.enums.ActionLogMessageState;
import java.util.Date;
import javax.annotation.Generated;
import javax.persistence.metamodel.SingularAttribute;
import javax.persistence.metamodel.StaticMetamodel;
@Generated(value="Dali", date="2012-10-24T19:52:46.826+0300")
@StaticMetamodel(ActionLogMessageResponse.class)
public class ActionLogMessageResponse_ extends GenericEntity_ {
public static volatile SingularAttribute<ActionLogMessageResponse, Date> time;
public static volatile SingularAttribute<ActionLogMessageResponse, EventUser> user;
public static volatile SingularAttribute<ActionLogMessageResponse, String> message;
public static volatile SingularAttribute<ActionLogMessageResponse, ActionLogMessageState> stateChange;
public static volatile SingularAttribute<ActionLogMessageResponse, ActionLogMessage> actionLogMessage;
}
code/LanBortalDatabase/src/fi/insomnia/bortal/model/ActionLogMessage_.java deleted 100644 → 0
package fi.insomnia.bortal.model;
import fi.insomnia.bortal.enums.ActionLogMessageState;
import java.util.Date;
import javax.annotation.Generated;
import javax.persistence.metamodel.ListAttribute;
import javax.persistence.metamodel.SingularAttribute;
import javax.persistence.metamodel.StaticMetamodel;
@Generated(value="Dali", date="2012-10-24T19:52:46.819+0300")
@StaticMetamodel(ActionLogMessage.class)
public class ActionLogMessage_ extends GenericEntity_ {
public static volatile SingularAttribute<ActionLogMessage, Date> time;
public static volatile SingularAttribute<ActionLogMessage, User> user;
public static volatile SingularAttribute<ActionLogMessage, Role> crew;
public static volatile SingularAttribute<ActionLogMessage, String> message;
public static volatile ListAttribute<ActionLogMessage, ActionLogMessageResponse> actionLogMessageResponses;
public static volatile SingularAttribute<ActionLogMessage, ActionLogMessageState> state;
}
code/LanBortalDatabase/src/fi/insomnia/bortal/model/ApplicationPermission_.java deleted 100644 → 0
package fi.insomnia.bortal.model;
import javax.annotation.Generated;
import javax.persistence.metamodel.SingularAttribute;
import javax.persistence.metamodel.StaticMetamodel;
@Generated(value="Dali", date="2012-10-24T19:52:46.830+0300")
@StaticMetamodel(ApplicationPermission.class)
public class ApplicationPermission_ extends GenericEntity_ {
public static volatile SingularAttribute<ApplicationPermission, String> application;
public static volatile SingularAttribute<ApplicationPermission, Role> role;
public static volatile SingularAttribute<ApplicationPermission, String> permission;
}
code/LanBortalDatabase/src/fi/insomnia/bortal/model/BillLine_.java deleted 100644 → 0
package fi.insomnia.bortal.model;
import java.math.BigDecimal;
import javax.annotation.Generated;
import javax.persistence.metamodel.SingularAttribute;
import javax.persistence.metamodel.StaticMetamodel;
@Generated(value="Dali", date="2012-10-26T02:39:28.679+0300")
@StaticMetamodel(BillLine.class)
public class BillLine_ extends GenericEntity_ {
public static volatile SingularAttribute<BillLine, Bill> bill;
public static volatile SingularAttribute<BillLine, String> name;
public static volatile SingularAttribute<BillLine, BigDecimal> quantity;
public static volatile SingularAttribute<BillLine, BigDecimal> unitPrice;
public static volatile SingularAttribute<BillLine, String> unitName;
public static volatile SingularAttribute<BillLine, BigDecimal> vat;
public static volatile SingularAttribute<BillLine, Product> lineProduct;
public static volatile SingularAttribute<BillLine, FoodWave> foodwave;
}
code/LanBortalDatabase/src/fi/insomnia/bortal/model/Bill_.java deleted 100644 → 0
package fi.insomnia.bortal.model;
import java.util.Calendar;
import java.util.Date;
import javax.annotation.Generated;
import javax.persistence.metamodel.ListAttribute;
import javax.persistence.metamodel.SingularAttribute;
import javax.persistence.metamodel.StaticMetamodel;
@Generated(value="Dali", date="2012-10-24T19:52:46.834+0300")
@StaticMetamodel(Bill.class)
public class Bill_ extends GenericEntity_ {
public static volatile SingularAttribute<Bill, LanEvent> event;
public static volatile SingularAttribute<Bill, Date> paidDate;
public static volatile SingularAttribute<Bill, Integer> billNumber;
public static volatile SingularAttribute<Bill, String> addr1;
public static volatile SingularAttribute<Bill, String> addr2;
public static volatile SingularAttribute<Bill, String> addr3;
public static volatile SingularAttribute<Bill, String> addr4;
public static volatile SingularAttribute<Bill, String> addr5;
public static volatile SingularAttribute<Bill, Calendar> sentDate;
public static volatile SingularAttribute<Bill, Integer> paymentTime;
public static volatile SingularAttribute<Bill, String> noticetime;
public static volatile SingularAttribute<Bill, String> theirReference;
public static volatile SingularAttribute<Bill, String> ourReference;
public static volatile SingularAttribute<Bill, String> deliveryTerms;
public static volatile SingularAttribute<Bill, Integer> delayIntrest;
public static volatile SingularAttribute<Bill, String> notes;
public static volatile ListAttribute<Bill, BillLine> billLines;
public static volatile SingularAttribute<Bill, AccountEvent> accountEvent;
public static volatile SingularAttribute<Bill, EventUser> user;
}
code/LanBortalDatabase/src/fi/insomnia/bortal/model/CardBarcode_.java deleted 100644 → 0
package fi.insomnia.bortal.model;
import javax.annotation.Generated;
import javax.persistence.metamodel.SingularAttribute;
import javax.persistence.metamodel.StaticMetamodel;
@Generated(value="Dali", date="2012-11-18T00:45:55.945+0200")
@StaticMetamodel(CardBarcode.class)
public class CardBarcode_ extends GenericEntity_ {
public static volatile SingularAttribute<CardBarcode, PrintedCard> printedCard;
}
code/LanBortalDatabase/src/fi/insomnia/bortal/model/CardTemplate_.java deleted 100644 → 0
package fi.insomnia.bortal.model;
import javax.annotation.Generated;
import javax.persistence.metamodel.ListAttribute;
import javax.persistence.metamodel.SingularAttribute;
import javax.persistence.metamodel.StaticMetamodel;
@Generated(value="Dali", date="2012-10-24T19:52:46.843+0300")
@StaticMetamodel(CardTemplate.class)
public class CardTemplate_ extends GenericEntity_ {
public static volatile SingularAttribute<CardTemplate, LanEvent> event;
public static volatile SingularAttribute<CardTemplate, byte[]> image;
public static volatile SingularAttribute<CardTemplate, String> name;
public static volatile SingularAttribute<CardTemplate, Integer> power;
public static volatile ListAttribute<CardTemplate, Role> roles;
public static volatile ListAttribute<CardTemplate, PrintedCard> cards;
}
code/LanBortalDatabase/src/fi/insomnia/bortal/model/CompoEntryFile_.java deleted 100644 → 0
package fi.insomnia.bortal.model;
import java.util.Calendar;
import javax.annotation.Generated;
import javax.persistence.metamodel.SingularAttribute;
import javax.persistence.metamodel.StaticMetamodel;
@Generated(value="Dali", date="2012-10-24T19:52:46.856+0300")
@StaticMetamodel(CompoEntryFile.class)
public class CompoEntryFile_ extends GenericEntity_ {
public static volatile SingularAttribute<CompoEntryFile, String> mimeType;
public static volatile SingularAttribute<CompoEntryFile, String> fileName;
public static volatile SingularAttribute<CompoEntryFile, String> description;
public static volatile SingularAttribute<CompoEntryFile, String> hash;
public static volatile SingularAttribute<CompoEntryFile, byte[]> fileData;
public static volatile SingularAttribute<CompoEntryFile, Calendar> uploaded;
public static volatile SingularAttribute<CompoEntryFile, CompoEntry> entry;
}
code/LanBortalDatabase/src/fi/insomnia/bortal/model/CompoEntryParticipant_.java deleted 100644 → 0
package fi.insomnia.bortal.model;
import java.util.Calendar;
import javax.annotation.Generated;
import javax.persistence.metamodel.SingularAttribute;
import javax.persistence.metamodel.StaticMetamodel;
@Generated(value="Dali", date="2012-10-24T19:52:46.860+0300")
@StaticMetamodel(CompoEntryParticipant.class)
public class CompoEntryParticipant_ extends GenericEntity_ {
public static volatile SingularAttribute<CompoEntryParticipant, CompoEntry> entry;
public static volatile SingularAttribute<CompoEntryParticipant, String> role;
public static volatile SingularAttribute<CompoEntryParticipant, String> nick;
public static volatile SingularAttribute<CompoEntryParticipant, Calendar> confirmed;
public static volatile SingularAttribute<CompoEntryParticipant, EventUser> user;
}
code/LanBortalDatabase/src/fi/insomnia/bortal/model/CompoEntry_.java deleted 100644 → 0
package fi.insomnia.bortal.model;
import java.util.Calendar;
import javax.annotation.Generated;
import javax.persistence.metamodel.ListAttribute;
import javax.persistence.metamodel.SingularAttribute;
import javax.persistence.metamodel.StaticMetamodel;
@Generated(value="Dali", date="2012-10-24T19:52:46.852+0300")
@StaticMetamodel(CompoEntry.class)
public class CompoEntry_ extends GenericEntity_ {
public static volatile SingularAttribute<CompoEntry, Compo> compo;
public static volatile SingularAttribute<CompoEntry, Calendar> created;
public static volatile SingularAttribute<CompoEntry, String> title;
public static volatile SingularAttribute<CompoEntry, String> author;
public static volatile SingularAttribute<CompoEntry, String> notes;
public static volatile SingularAttribute<CompoEntry, String> screenMessage;
public static volatile SingularAttribute<CompoEntry, Integer> sort;
public static volatile SingularAttribute<CompoEntry, Integer> finalPosition;
public static volatile SingularAttribute<CompoEntry, CompoEntryFile> currentFile;
public static volatile ListAttribute<CompoEntry, Vote> votes;
public static volatile ListAttribute<CompoEntry, CompoEntryFile> files;
public static volatile ListAttribute<CompoEntry, CompoEntryParticipant> participants;
public static volatile SingularAttribute<CompoEntry, EventUser> creator;
}
code/LanBortalDatabase/src/fi/insomnia/bortal/model/Compo_.java deleted 100644 → 0
package fi.insomnia.bortal.model;
import java.util.Calendar;
import javax.annotation.Generated;
import javax.persistence.metamodel.ListAttribute;
import javax.persistence.metamodel.SingularAttribute;
import javax.persistence.metamodel.StaticMetamodel;
@Generated(value="Dali", date="2012-10-24T19:52:46.847+0300")
@StaticMetamodel(Compo.class)
public class Compo_ extends GenericEntity_ {
public static volatile SingularAttribute<Compo, String> name;
public static volatile SingularAttribute<Compo, LanEvent> event;
public static volatile SingularAttribute<Compo, Calendar> startTime;
public static volatile SingularAttribute<Compo, Calendar> endTime;
public static volatile SingularAttribute<Compo, Calendar> voteStart;
public static volatile SingularAttribute<Compo, Calendar> voteEnd;
public static volatile SingularAttribute<Compo, Calendar> submitStart;
public static volatile SingularAttribute<Compo, Calendar> submitEnd;
public static volatile SingularAttribute<Compo, String> description;
public static volatile SingularAttribute<Compo, Integer> maxParticipantCount;
public static volatile SingularAttribute<Compo, Boolean> holdVoting;
public static volatile ListAttribute<Compo, CompoEntry> compoEntries;
}
code/LanBortalDatabase/src/fi/insomnia/bortal/model/DiscountInstance_.java deleted 100644 → 0
package fi.insomnia.bortal.model;
import javax.annotation.Generated;
import javax.persistence.metamodel.SingularAttribute;
import javax.persistence.metamodel.StaticMetamodel;
@Generated(value="Dali", date="2012-10-24T19:52:46.868+0300")
@StaticMetamodel(DiscountInstance.class)
public class DiscountInstance_ extends GenericEntity_ {
public static volatile SingularAttribute<DiscountInstance, AccountEvent> accountEvent;
public static volatile SingularAttribute<DiscountInstance, Discount> discount;
}
code/LanBortalDatabase/src/fi/insomnia/bortal/model/Discount_.java deleted 100644 → 0
package fi.insomnia.bortal.model;
import java.math.BigDecimal;
import java.util.Calendar;
import javax.annotation.Generated;
import javax.persistence.metamodel.ListAttribute;
import javax.persistence.metamodel.SingularAttribute;
import javax.persistence.metamodel.StaticMetamodel;
@Generated(value="Dali", date="2012-10-24T19:52:46.864+0300")
@StaticMetamodel(Discount.class)
public class Discount_ extends GenericEntity_ {
public static volatile SingularAttribute<Discount, LanEvent> event;
public static volatile SingularAttribute<Discount, BigDecimal> percentage;
public static volatile SingularAttribute<Discount, String> code;
public static volatile SingularAttribute<Discount, Calendar> validFrom;
public static volatile SingularAttribute<Discount, Calendar> validTo;
public static volatile SingularAttribute<Discount, String> details;
public static volatile SingularAttribute<Discount, String> shortdesc;
public static volatile SingularAttribute<Discount, BigDecimal> amountMin;
public static volatile SingularAttribute<Discount, BigDecimal> amountMax;
public static volatile SingularAttribute<Discount, Boolean> active;
public static volatile SingularAttribute<Discount, BigDecimal> maxNum;
public static volatile SingularAttribute<Discount, BigDecimal> perUser;
public static volatile SingularAttribute<Discount, BigDecimal> totalCount;
public static volatile ListAttribute<Discount, DiscountInstance> discountInstances;
public static volatile SingularAttribute<Discount, Role> role;
public static volatile ListAttribute<Discount, Product> products;
}
code/LanBortalDatabase/src/fi/insomnia/bortal/model/EntityEquals_.java deleted 100644 → 0
package fi.insomnia.bortal.model;
import javax.annotation.Generated;
import javax.persistence.metamodel.StaticMetamodel;
@Generated(value="Dali", date="2012-10-24T19:52:46.872+0300")
@StaticMetamodel(EntityEquals.class)
public class EntityEquals_ {
}
code/LanBortalDatabase/src/fi/insomnia/bortal/model/EventMap_.java deleted 100644 → 0
package fi.insomnia.bortal.model;
import javax.annotation.Generated;
import javax.persistence.metamodel.ListAttribute;
import javax.persistence.metamodel.SingularAttribute;
import javax.persistence.metamodel.StaticMetamodel;
@Generated(value="Dali", date="2012-10-24T19:52:46.875+0300")
@StaticMetamodel(EventMap.class)
public class EventMap_ extends GenericEntity_ {
public static volatile SingularAttribute<EventMap, LanEvent> event;
public static volatile SingularAttribute<EventMap, byte[]> mapData;
public static volatile SingularAttribute<EventMap, String> name;
public static volatile ListAttribute<EventMap, Place> places;
public static volatile ListAttribute<EventMap, Reader> readers;
public static volatile SingularAttribute<EventMap, Boolean> active;
public static volatile SingularAttribute<EventMap, String> notes;
}
code/LanBortalDatabase/src/fi/insomnia/bortal/model/EventOrganiser_.java deleted 100644 → 0
package fi.insomnia.bortal.model;
import javax.annotation.Generated;
import javax.persistence.metamodel.ListAttribute;
import javax.persistence.metamodel.SingularAttribute;
import javax.persistence.metamodel.StaticMetamodel;
@Generated(value="Dali", date="2012-10-24T19:52:46.880+0300")
@StaticMetamodel(EventOrganiser.class)
public class EventOrganiser_ extends GenericEntity_ {
public static volatile SingularAttribute<EventOrganiser, String> organisation;
public static volatile SingularAttribute<EventOrganiser, String> bundleCountry;
public static volatile ListAttribute<EventOrganiser, LanEvent> events;
public static volatile SingularAttribute<EventOrganiser, String> billAddress1;
public static volatile SingularAttribute<EventOrganiser, String> billAddress2;
public static volatile SingularAttribute<EventOrganiser, String> billAddress3;
public static volatile SingularAttribute<EventOrganiser, String> billAddress4;
public static volatile SingularAttribute<EventOrganiser, String> bankNumber1;
public static volatile SingularAttribute<EventOrganiser, String> bankNumber2;
public static volatile SingularAttribute<EventOrganiser, String> bankName1;
public static volatile SingularAttribute<EventOrganiser, String> bankName2;
}
code/LanBortalDatabase/src/fi/insomnia/bortal/model/EventUser_.java deleted 100644 → 0
package fi.insomnia.bortal.model;
import java.util.Date;
import javax.annotation.Generated;
import javax.persistence.metamodel.ListAttribute;
import javax.persistence.metamodel.SingularAttribute;
import javax.persistence.metamodel.StaticMetamodel;
@Generated(value="Dali", date="2012-10-24T19:52:46.885+0300")
@StaticMetamodel(EventUser.class)
public class EventUser_ extends GenericEntity_ {
public static volatile SingularAttribute<EventUser, User> user;
public static volatile SingularAttribute<EventUser, LanEvent> event;
public static volatile ListAttribute<EventUser, Vote> votes;
public static volatile ListAttribute<EventUser, UserNote> notes;
public static volatile ListAttribute<EventUser, Role> roles;
public static volatile ListAttribute<EventUser, CompoEntryParticipant> compoEntryParticipants;
public static volatile ListAttribute<EventUser, CompoEntry> compoEntries;
public static volatile ListAttribute<EventUser, PlaceGroup> placeGroups;
public static volatile ListAttribute<EventUser, GroupMembership> groupMemberships;
public static volatile ListAttribute<EventUser, Place> currentPlaces;
public static volatile ListAttribute<EventUser, PrintedCard> printedCards;
public static volatile ListAttribute<EventUser, AccountEvent> accountEvents;
public static volatile ListAttribute<EventUser, Bill> bills;
public static volatile ListAttribute<EventUser, AccountEvent> soldItems;
public static volatile ListAttribute<EventUser, PollAnswer> pollAnswers;
public static volatile SingularAttribute<EventUser, EventUser> creator;
public static volatile SingularAttribute<EventUser, Date> eventuserCreated;
}
code/LanBortalDatabase/src/fi/insomnia/bortal/model/Feedback_.java deleted 100644 → 0
package fi.insomnia.bortal.model;
import java.util.Calendar;
import javax.annotation.Generated;
import javax.persistence.metamodel.SingularAttribute;
import javax.persistence.metamodel.StaticMetamodel;
@Generated(value="Dali", date="2012-11-01T13:46:40.118+0200")
@StaticMetamodel(Feedback.class)
public class Feedback_ extends GenericEntity_ {
public static volatile SingularAttribute<Feedback, EventUser> sender;
public static volatile SingularAttribute<Feedback, LanEvent> event;
public static volatile SingularAttribute<Feedback, Calendar> timestamp;
public static volatile SingularAttribute<Feedback, String> message;
}
code/LanBortalDatabase/src/fi/insomnia/bortal/model/FoodWaveTemplate_.java deleted 100644 → 0
package fi.insomnia.bortal.model;
import javax.annotation.Generated;
import javax.persistence.metamodel.ListAttribute;
import javax.persistence.metamodel.SingularAttribute;
import javax.persistence.metamodel.StaticMetamodel;
@Generated(value="Dali", date="2012-11-01T13:46:29.082+0200")
@StaticMetamodel(FoodWaveTemplate.class)
public class FoodWaveTemplate_ extends GenericEntity_ {
public static volatile SingularAttribute<FoodWaveTemplate, LanEvent> event;
public static volatile SingularAttribute<FoodWaveTemplate, String> name;
public static volatile SingularAttribute<FoodWaveTemplate, String> description;
public static volatile ListAttribute<FoodWaveTemplate, Product> products;
public static volatile ListAttribute<FoodWaveTemplate, FoodWave> foodwaves;
public static volatile SingularAttribute<FoodWaveTemplate, Integer> maximumFoods;
}
code/LanBortalDatabase/src/fi/insomnia/bortal/model/FoodWave_.java deleted 100644 → 0
package fi.insomnia.bortal.model;
import java.util.Date;
import javax.annotation.Generated;
import javax.persistence.metamodel.ListAttribute;
import javax.persistence.metamodel.SingularAttribute;
import javax.persistence.metamodel.StaticMetamodel;
@Generated(value="Dali", date="2012-11-18T00:45:52.230+0200")
@StaticMetamodel(FoodWave.class)
public class FoodWave_ extends GenericEntity_ {
public static volatile SingularAttribute<FoodWave, String> name;
public static volatile SingularAttribute<FoodWave, String> description;
public static volatile SingularAttribute<FoodWave, Date> time;
public static volatile SingularAttribute<FoodWave, Integer> maximumFoods;
public static volatile SingularAttribute<FoodWave, Boolean> closed;
public static volatile ListAttribute<FoodWave, AccountEvent> accountEvents;
public static volatile ListAttribute<FoodWave, BillLine> billLines;
public static volatile SingularAttribute<FoodWave, FoodWaveTemplate> template;
}
code/LanBortalDatabase/src/fi/insomnia/bortal/model/GenericEntity_.java deleted 100644 → 0
package fi.insomnia.bortal.model;
import javax.annotation.Generated;
import javax.persistence.metamodel.SingularAttribute;
import javax.persistence.metamodel.StaticMetamodel;
@Generated(value="Dali", date="2012-10-24T19:52:46.897+0300")
@StaticMetamodel(GenericEntity.class)
public class GenericEntity_ extends EntityEquals_ {
public static volatile SingularAttribute<GenericEntity, Integer> id;
}
code/LanBortalDatabase/src/fi/insomnia/bortal/model/GroupMembership_.java deleted 100644 → 0
package fi.insomnia.bortal.model;
import java.util.Calendar;
import javax.annotation.Generated;
import javax.persistence.metamodel.SingularAttribute;
import javax.persistence.metamodel.StaticMetamodel;
@Generated(value="Dali", date="2012-10-24T19:52:46.901+0300")
@StaticMetamodel(GroupMembership.class)
public class GroupMembership_ extends GenericEntity_ {
public static volatile SingularAttribute<GroupMembership, String> inviteToken;
public static volatile SingularAttribute<GroupMembership, Calendar> inviteAccepted;
public static volatile SingularAttribute<GroupMembership, String> inviteEmail;
public static volatile SingularAttribute<GroupMembership, String> inviteName;
public static volatile SingularAttribute<GroupMembership, PlaceGroup> placeGroup;
public static volatile SingularAttribute<GroupMembership, Place> placeReservation;
public static volatile SingularAttribute<GroupMembership, EventUser> user;
public static volatile SingularAttribute<GroupMembership, Calendar> enteredEvent;
}
code/LanBortalDatabase/src/fi/insomnia/bortal/model/InventoryEvent_.java deleted 100644 → 0
package fi.insomnia.bortal.model;
import java.math.BigDecimal;
import java.util.Date;
import javax.annotation.Generated;
import javax.persistence.metamodel.SingularAttribute;
import javax.persistence.metamodel.StaticMetamodel;
@Generated(value="Dali", date="2012-11-18T00:45:52.284+0200")
@StaticMetamodel(InventoryEvent.class)
public class InventoryEvent_ extends GenericEntity_ {
public static volatile SingularAttribute<InventoryEvent, Date> created;
public static volatile SingularAttribute<InventoryEvent, User> user;
public static volatile SingularAttribute<InventoryEvent, Product> product;
public static volatile SingularAttribute<InventoryEvent, String> info;
public static volatile SingularAttribute<InventoryEvent, BigDecimal> quantity;
}
code/LanBortalDatabase/src/fi/insomnia/bortal/model/LanEventDomain_.java deleted 100644 → 0
package fi.insomnia.bortal.model;
import javax.annotation.Generated;
import javax.persistence.metamodel.SingularAttribute;
import javax.persistence.metamodel.StaticMetamodel;
@Generated(value="Dali", date="2012-10-24T19:52:46.910+0300")
@StaticMetamodel(LanEventDomain.class)
public class LanEventDomain_ extends GenericEntity_ {
public static volatile SingularAttribute<LanEventDomain, String> domain;
public static volatile SingularAttribute<LanEventDomain, String> description;
public static volatile SingularAttribute<LanEventDomain, LanEvent> event;
public static volatile SingularAttribute<LanEventDomain, Integer> overridePriority;
}
code/LanBortalDatabase/src/fi/insomnia/bortal/model/LanEventPrivateProperty_.java deleted 100644 → 0
package fi.insomnia.bortal.model;
import java.math.BigDecimal;
import java.util.Date;
import javax.annotation.Generated;
import javax.persistence.metamodel.SingularAttribute;
import javax.persistence.metamodel.StaticMetamodel;
@Generated(value="Dali", date="2012-10-24T19:52:46.914+0300")
@StaticMetamodel(LanEventPrivateProperty.class)
public class LanEventPrivateProperty_ extends GenericEntity_ {
public static volatile SingularAttribute<LanEventPrivateProperty, EventOrganiser> eventorg;
public static volatile SingularAttribute<LanEventPrivateProperty, LanEvent> event;
public static volatile SingularAttribute<LanEventPrivateProperty, LanEventPrivatePropertyKey> key;
public static volatile SingularAttribute<LanEventPrivateProperty, String> description;
public static volatile SingularAttribute<LanEventPrivateProperty, Boolean> booleanValue;
public static volatile SingularAttribute<LanEventPrivateProperty, String> textvalue;
public static volatile SingularAttribute<LanEventPrivateProperty, BigDecimal> decimalValue;
public static volatile SingularAttribute<LanEventPrivateProperty, Long> longValue;
public static volatile SingularAttribute<LanEventPrivateProperty, String> byteMime;
public static volatile SingularAttribute<LanEventPrivateProperty, byte[]> byteValue;
public static volatile SingularAttribute<LanEventPrivateProperty, Date> dateValue;
}
code/LanBortalDatabase/src/fi/insomnia/bortal/model/LanEventProperty_.java deleted 100644 → 0
package fi.insomnia.bortal.model;
import java.math.BigDecimal;
import java.util.Date;
import javax.annotation.Generated;
import javax.persistence.metamodel.SingularAttribute;
import javax.persistence.metamodel.StaticMetamodel;
@Generated(value="Dali", date="2012-10-24T19:52:46.918+0300")
@StaticMetamodel(LanEventProperty.class)
public class LanEventProperty_ extends GenericEntity_ {
public static volatile SingularAttribute<LanEventProperty, EventOrganiser> eventorg;
public static volatile SingularAttribute<LanEventProperty, LanEvent> event;
public static volatile SingularAttribute<LanEventProperty, LanEventPropertyKey> key;
public static volatile SingularAttribute<LanEventProperty, String> description;
public static volatile SingularAttribute<LanEventProperty, Boolean> booleanValue;
public static volatile SingularAttribute<LanEventProperty, String> textvalue;
public static volatile SingularAttribute<LanEventProperty, BigDecimal> decimalValue;
public static volatile SingularAttribute<LanEventProperty, Long> longValue;
public static volatile SingularAttribute<LanEventProperty, String> byteMime;
public static volatile SingularAttribute<LanEventProperty, byte[]> byteValue;
public static volatile SingularAttribute<LanEventProperty, Date> dateValue;
}
code/LanBortalDatabase/src/fi/insomnia/bortal/model/LanEvent_.java deleted 100644 → 0
package fi.insomnia.bortal.model;
import fi.insomnia.bortal.enums.EventStatus;
import fi.insomnia.bortal.model.salespoint.Salespoint;
import java.util.Calendar;
import javax.annotation.Generated;
import javax.persistence.metamodel.ListAttribute;
import javax.persistence.metamodel.SingularAttribute;
import javax.persistence.metamodel.StaticMetamodel;
@Generated(value="Dali", date="2012-10-24T19:52:46.905+0300")
@StaticMetamodel(LanEvent.class)
public class LanEvent_ extends GenericEntity_ {
public static volatile SingularAttribute<LanEvent, Calendar> startTime;
public static volatile SingularAttribute<LanEvent, Calendar> endTime;
public static volatile SingularAttribute<LanEvent, String> name;
public static volatile SingularAttribute<LanEvent, Boolean> eventEnabled;
public static volatile SingularAttribute<LanEvent, Integer> referenceNumberBase;
public static volatile SingularAttribute<LanEvent, Integer> nextBillNumber;
public static volatile SingularAttribute<LanEvent, EventOrganiser> organiser;
public static volatile SingularAttribute<LanEvent, EventStatus> status;
public static volatile ListAttribute<LanEvent, LogEntry> logEntries;
public static volatile SingularAttribute<LanEvent, Role> defaultRole;
public static volatile ListAttribute<LanEvent, Compo> compos;
public static volatile ListAttribute<LanEvent, CardTemplate> cardTemplates;
public static volatile ListAttribute<LanEvent, EventMap> eventMaps;
public static volatile ListAttribute<LanEvent, Role> roles;
public static volatile ListAttribute<LanEvent, Bill> bills;
public static volatile ListAttribute<LanEvent, Reader> readers;
public static volatile ListAttribute<LanEvent, Poll> polls;
public static volatile ListAttribute<LanEvent, Salespoint> salespoints;
public static volatile ListAttribute<LanEvent, LanEventDomain> domains;
public static volatile ListAttribute<LanEvent, LanEventProperty> properties;
}
code/LanBortalDatabase/src/fi/insomnia/bortal/model/Location_.java deleted 100644 → 0
package fi.insomnia.bortal.model;
import javax.annotation.Generated;
import javax.persistence.metamodel.ListAttribute;
import javax.persistence.metamodel.SingularAttribute;
import javax.persistence.metamodel.StaticMetamodel;
@Generated(value="Dali", date="2012-10-24T19:52:46.923+0300")
@StaticMetamodel(Location.class)
public class Location_ extends GenericEntity_ {
public static volatile SingularAttribute<Location, LanEvent> event;
public static volatile SingularAttribute<Location, String> name;
public static volatile ListAttribute<Location, Reader> readers;
public static volatile ListAttribute<Location, PrintedCard> printedCardsAtLocation;
}
code/LanBortalDatabase/src/fi/insomnia/bortal/model/LogEntryType_.java deleted 100644 → 0
package fi.insomnia.bortal.model;
import javax.annotation.Generated;
import javax.persistence.metamodel.ListAttribute;
import javax.persistence.metamodel.SingularAttribute;
import javax.persistence.metamodel.StaticMetamodel;
@Generated(value="Dali", date="2012-10-24T19:52:46.930+0300")
@StaticMetamodel(LogEntryType.class)
public class LogEntryType_ extends GenericEntity_ {
public static volatile SingularAttribute<LogEntryType, String> name;
public static volatile SingularAttribute<LogEntryType, String> description;
public static volatile ListAttribute<LogEntryType, LogEntry> logEntries;
public static volatile SingularAttribute<LogEntryType, Integer> logLevel;
}
code/LanBortalDatabase/src/fi/insomnia/bortal/model/LogEntry_.java deleted 100644 → 0
package fi.insomnia.bortal.model;
import java.util.Calendar;
import javax.annotation.Generated;
import javax.persistence.metamodel.SingularAttribute;
import javax.persistence.metamodel.StaticMetamodel;
@Generated(value="Dali", date="2012-10-24T19:52:46.927+0300")
@StaticMetamodel(LogEntry.class)
public class LogEntry_ extends GenericEntity_ {
public static volatile SingularAttribute<LogEntry, LanEvent> parentEvent;
public static volatile SingularAttribute<LogEntry, Calendar> time;
public static volatile SingularAttribute<LogEntry, String> description;
public static volatile SingularAttribute<LogEntry, LogEntryType> type;
public static volatile SingularAttribute<LogEntry, User> user;
}
code/LanBortalDatabase/src/fi/insomnia/bortal/model/MenuNavigation_.java deleted 100644 → 0
package fi.insomnia.bortal.model;
import javax.annotation.Generated;
import javax.persistence.metamodel.ListAttribute;
import javax.persistence.metamodel.SingularAttribute;
import javax.persistence.metamodel.StaticMetamodel;
@Generated(value="Dali", date="2012-10-25T01:54:09.095+0300")
@StaticMetamodel(MenuNavigation.class)
public class MenuNavigation_ extends GenericEntity_ {
public static volatile SingularAttribute<MenuNavigation, LanEvent> event;
public static volatile SingularAttribute<MenuNavigation, String> key;
public static volatile SingularAttribute<MenuNavigation, String> header;
public static volatile SingularAttribute<MenuNavigation, String> footer;
public static volatile SingularAttribute<MenuNavigation, Integer> sort;
public static volatile SingularAttribute<MenuNavigation, Boolean> visible;
public static volatile SingularAttribute<MenuNavigation, Menuitem> item;
public static volatile SingularAttribute<MenuNavigation, SitePage> sitepage;
public static volatile SingularAttribute<MenuNavigation, MenuNavigation> parent;
public static volatile ListAttribute<MenuNavigation, MenuNavigation> children;
public static volatile SingularAttribute<MenuNavigation, String> application;
public static volatile SingularAttribute<MenuNavigation, String> permission;
}
code/LanBortalDatabase/src/fi/insomnia/bortal/model/Menuitem_.java deleted 100644 → 0
package fi.insomnia.bortal.model;
import javax.annotation.Generated;
import javax.persistence.metamodel.ListAttribute;
import javax.persistence.metamodel.SingularAttribute;
import javax.persistence.metamodel.StaticMetamodel;
@Generated(value="Dali", date="2012-10-24T19:52:46.934+0300")
@StaticMetamodel(Menuitem.class)
public class Menuitem_ extends GenericEntity_ {
public static volatile SingularAttribute<Menuitem, String> url;
public static volatile SingularAttribute<Menuitem, String> description;
public static volatile ListAttribute<Menuitem, MenuNavigation> navigations;
}
code/LanBortalDatabase/src/fi/insomnia/bortal/model/NewsGroup_.java deleted 100644 → 0
package fi.insomnia.bortal.model;
import javax.annotation.Generated;
import javax.persistence.metamodel.ListAttribute;
import javax.persistence.metamodel.SingularAttribute;
import javax.persistence.metamodel.StaticMetamodel;
@Generated(value="Dali", date="2012-10-24T19:52:46.947+0300")
@StaticMetamodel(NewsGroup.class)
public class NewsGroup_ extends GenericEntity_ {
public static volatile SingularAttribute<NewsGroup, LanEvent> event;
public static volatile SingularAttribute<NewsGroup, String> name;
public static volatile SingularAttribute<NewsGroup, String> description;
public static volatile SingularAttribute<NewsGroup, Integer> priority;
public static volatile SingularAttribute<NewsGroup, Role> writerRole;
public static volatile ListAttribute<NewsGroup, News> news;
public static volatile ListAttribute<NewsGroup, Role> readerRoles;
}
code/LanBortalDatabase/src/fi/insomnia/bortal/model/News_.java deleted 100644 → 0
package fi.insomnia.bortal.model;
import java.util.Date;
import javax.annotation.Generated;
import javax.persistence.metamodel.SingularAttribute;
import javax.persistence.metamodel.StaticMetamodel;
@Generated(value="Dali", date="2012-10-24T19:52:46.943+0300")
@StaticMetamodel(News.class)
public class News_ extends GenericEntity_ {
public static volatile SingularAttribute<News, String> title;
public static volatile SingularAttribute<News, String> body;
public static volatile SingularAttribute<News, String> bodyAbstract;
public static volatile SingularAttribute<News, Date> publish;
public static volatile SingularAttribute<News, Date> expire;
public static volatile SingularAttribute<News, EventUser> creator;
public static volatile SingularAttribute<News, Integer> priority;
public static volatile SingularAttribute<News, NewsGroup> group;
}
code/LanBortalDatabase/src/fi/insomnia/bortal/model/OrgRole_.java deleted 100644 → 0
package fi.insomnia.bortal.model;
import javax.annotation.Generated;
import javax.persistence.metamodel.ListAttribute;
import javax.persistence.metamodel.SingularAttribute;
import javax.persistence.metamodel.StaticMetamodel;
@Generated(value="Dali", date="2012-10-24T19:52:46.952+0300")
@StaticMetamodel(OrgRole.class)
public class OrgRole_ extends GenericEntity_ {
public static volatile SingularAttribute<OrgRole, String> name;
public static volatile ListAttribute<OrgRole, User> users;
public static volatile ListAttribute<OrgRole, OrgRole> parents;
public static volatile ListAttribute<OrgRole, OrgRole> children;
public static volatile SingularAttribute<OrgRole, EventOrganiser> eventOrganisation;
public static volatile SingularAttribute<OrgRole, Boolean> manageOrganisation;
public static volatile ListAttribute<OrgRole, Role> eventRoles;
}
code/LanBortalDatabase/src/fi/insomnia/bortal/model/PageContent_.java deleted 100644 → 0
package fi.insomnia.bortal.model;
import java.util.Date;
import javax.annotation.Generated;
import javax.persistence.metamodel.SingularAttribute;
import javax.persistence.metamodel.StaticMetamodel;
@Generated(value="Dali", date="2012-10-24T19:52:46.956+0300")
@StaticMetamodel(PageContent.class)
public class PageContent_ extends GenericEntity_ {
public static volatile SingularAttribute<PageContent, SitePage> sitepage;
public static volatile SingularAttribute<PageContent, Integer> sort;
public static volatile SingularAttribute<PageContent, String> content;
public static volatile SingularAttribute<PageContent, Date> publish;
public static volatile SingularAttribute<PageContent, Date> expire;
}
code/LanBortalDatabase/src/fi/insomnia/bortal/model/PlaceGroup_.java deleted 100644 → 0
package fi.insomnia.bortal.model;
import java.util.Calendar;
import javax.annotation.Generated;
import javax.persistence.metamodel.ListAttribute;
import javax.persistence.metamodel.SingularAttribute;
import javax.persistence.metamodel.StaticMetamodel;
@Generated(value="Dali", date="2012-10-24T19:52:46.964+0300")
@StaticMetamodel(PlaceGroup.class)
public class PlaceGroup_ extends GenericEntity_ {
public static volatile SingularAttribute<PlaceGroup, Calendar> created;
public static volatile SingularAttribute<PlaceGroup, LanEvent> event;
public static volatile SingularAttribute<PlaceGroup, Calendar> edited;
public static volatile SingularAttribute<PlaceGroup, String> code;
public static volatile SingularAttribute<PlaceGroup, String> name;
public static volatile SingularAttribute<PlaceGroup, Boolean> active;
public static volatile SingularAttribute<PlaceGroup, String> details;
public static volatile SingularAttribute<PlaceGroup, EventUser> creator;
public static volatile ListAttribute<PlaceGroup, GroupMembership> members;
public static volatile ListAttribute<PlaceGroup, Place> places;
}
code/LanBortalDatabase/src/fi/insomnia/bortal/model/Place_.java deleted 100644 → 0
package fi.insomnia.bortal.model;
import java.util.Calendar;
import javax.annotation.Generated;
import javax.persistence.metamodel.SingularAttribute;
import javax.persistence.metamodel.StaticMetamodel;
@Generated(value="Dali", date="2012-10-24T19:52:46.960+0300")
@StaticMetamodel(Place.class)
public class Place_ extends GenericEntity_ {
public static volatile SingularAttribute<Place, String> description;
public static volatile SingularAttribute<Place, String> name;
public static volatile SingularAttribute<Place, Integer> mapX;
public static volatile SingularAttribute<Place, Integer> mapY;
public static volatile SingularAttribute<Place, Integer> width;
public static volatile SingularAttribute<Place, Integer> height;
public static volatile SingularAttribute<Place, Calendar> releaseTime;
public static volatile SingularAttribute<Place, String> details;
public static volatile SingularAttribute<Place, String> code;
public static volatile SingularAttribute<Place, GroupMembership> placeReserver;
public static volatile SingularAttribute<Place, Boolean> buyable;
public static volatile SingularAttribute<Place, Boolean> disabled;
public static volatile SingularAttribute<Place, PlaceGroup> group;
public static volatile SingularAttribute<Place, Role> providesRole;
public static volatile SingularAttribute<Place, EventMap> map;
public static volatile SingularAttribute<Place, Product> product;
public static volatile SingularAttribute<Place, EventUser> currentUser;
}
code/LanBortalDatabase/src/fi/insomnia/bortal/model/PollAnswer_.java deleted 100644 → 0
package fi.insomnia.bortal.model;
import javax.annotation.Generated;
import javax.persistence.metamodel.SingularAttribute;
import javax.persistence.metamodel.StaticMetamodel;
@Generated(value="Dali", date="2012-10-24T19:52:46.973+0300")
@StaticMetamodel(PollAnswer.class)
public class PollAnswer_ extends GenericEntity_ {
public static volatile SingularAttribute<PollAnswer, String> answerText;
public static volatile SingularAttribute<PollAnswer, Boolean> answerBoolean;
public static volatile SingularAttribute<PollAnswer, PossibleAnswer> choice;
public static volatile SingularAttribute<PollAnswer, EventUser> user;
}
code/LanBortalDatabase/src/fi/insomnia/bortal/model/PollQuestion_.java deleted 100644 → 0
package fi.insomnia.bortal.model;
import javax.annotation.Generated;
import javax.persistence.metamodel.ListAttribute;
import javax.persistence.metamodel.SingularAttribute;
import javax.persistence.metamodel.StaticMetamodel;
@Generated(value="Dali", date="2012-10-24T19:52:46.976+0300")
@StaticMetamodel(PollQuestion.class)
public class PollQuestion_ extends GenericEntity_ {
public static volatile SingularAttribute<PollQuestion, Integer> characters;
public static volatile SingularAttribute<PollQuestion, Poll> poll;
public static volatile ListAttribute<PollQuestion, PossibleAnswer> answers;
public static volatile SingularAttribute<PollQuestion, String> question;
public static volatile SingularAttribute<PollQuestion, Integer> choices;
public static volatile SingularAttribute<PollQuestion, Integer> sort;
public static volatile SingularAttribute<PollQuestion, Integer> page;
}
code/LanBortalDatabase/src/fi/insomnia/bortal/model/Poll_.java deleted 100644 → 0
package fi.insomnia.bortal.model;
import java.util.Date;
import javax.annotation.Generated;
import javax.persistence.metamodel.ListAttribute;
import javax.persistence.metamodel.SingularAttribute;
import javax.persistence.metamodel.StaticMetamodel;
@Generated(value="Dali", date="2012-10-24T19:52:46.968+0300")
@StaticMetamodel(Poll.class)
public class Poll_ extends GenericEntity_ {
public static volatile SingularAttribute<Poll, LanEvent> event;
public static volatile SingularAttribute<Poll, Date> begin;
public static volatile SingularAttribute<Poll, Date> end;
public static volatile SingularAttribute<Poll, String> name;
public static volatile SingularAttribute<Poll, String> description;
public static volatile ListAttribute<Poll, PollQuestion> questions;
}
code/LanBortalDatabase/src/fi/insomnia/bortal/model/PossibleAnswer_.java deleted 100644 → 0
package fi.insomnia.bortal.model;
import javax.annotation.Generated;
import javax.persistence.metamodel.ListAttribute;
import javax.persistence.metamodel.SingularAttribute;
import javax.persistence.metamodel.StaticMetamodel;
@Generated(value="Dali", date="2012-10-24T19:52:46.980+0300")
@StaticMetamodel(PossibleAnswer.class)
public class PossibleAnswer_ extends GenericEntity_ {
public static volatile SingularAttribute<PossibleAnswer, String> answer;
public static volatile SingularAttribute<PossibleAnswer, Integer> sort;
public static volatile SingularAttribute<PossibleAnswer, Boolean> textanswer;
public static volatile SingularAttribute<PossibleAnswer, String> description;
public static volatile SingularAttribute<PossibleAnswer, PollQuestion> question;
public static volatile ListAttribute<PossibleAnswer, PollAnswer> answers;
}
code/LanBortalDatabase/src/fi/insomnia/bortal/model/PrintedCard_.java deleted 100644 → 0
package fi.insomnia.bortal.model;
import java.util.Calendar;
import javax.annotation.Generated;
import javax.persistence.metamodel.ListAttribute;
import javax.persistence.metamodel.SingularAttribute;
import javax.persistence.metamodel.StaticMetamodel;
@Generated(value="Dali", date="2012-10-24T19:52:46.985+0300")
@StaticMetamodel(PrintedCard.class)
public class PrintedCard_ extends GenericEntity_ {
public static volatile SingularAttribute<PrintedCard, LanEvent> event;
public static volatile SingularAttribute<PrintedCard, Calendar> printTime;
public static volatile SingularAttribute<PrintedCard, String> barcode;
public static volatile SingularAttribute<PrintedCard, Boolean> enabled;
public static volatile SingularAttribute<PrintedCard, String> rfidUid;
public static volatile ListAttribute<PrintedCard, ReaderEvent> readerEvents;
public static volatile SingularAttribute<PrintedCard, Integer> printCount;
public static volatile SingularAttribute<PrintedCard, Location> currentLocation;
public static volatile SingularAttribute<PrintedCard, EventUser> user;
public static volatile SingularAttribute<PrintedCard, CardTemplate> template;
}
code/LanBortalDatabase/src/fi/insomnia/bortal/model/ProductLimitation_.java deleted 100644 → 0
package fi.insomnia.bortal.model;
import java.math.BigDecimal;
import javax.annotation.Generated;
import javax.persistence.metamodel.ListAttribute;
import javax.persistence.metamodel.SingularAttribute;
import javax.persistence.metamodel.StaticMetamodel;
@Generated(value="Dali", date="2012-10-24T19:52:46.995+0300")
@StaticMetamodel(ProductLimitation.class)
public class ProductLimitation_ extends GenericEntity_ {
public static volatile SingularAttribute<ProductLimitation, ProductLimitationType> type;
public static volatile SingularAttribute<ProductLimitation, Boolean> last;
public static volatile SingularAttribute<ProductLimitation, String> name;
public static volatile SingularAttribute<ProductLimitation, String> description;
public static volatile SingularAttribute<ProductLimitation, Integer> sort;
public static volatile ListAttribute<ProductLimitation, Product> products;
public static volatile SingularAttribute<ProductLimitation, BigDecimal> upperLimit;
public static volatile SingularAttribute<ProductLimitation, BigDecimal> lowerLimit;
public static volatile ListAttribute<ProductLimitation, Role> matchingRoles;
}
code/LanBortalDatabase/src/fi/insomnia/bortal/model/Product_.java deleted 100644 → 0
package fi.insomnia.bortal.model;
import java.math.BigDecimal;
import javax.annotation.Generated;
import javax.persistence.metamodel.ListAttribute;
import javax.persistence.metamodel.SetAttribute;
import javax.persistence.metamodel.SingularAttribute;
import javax.persistence.metamodel.StaticMetamodel;
@Generated(value="Dali", date="2012-11-18T00:45:52.346+0200")
@StaticMetamodel(Product.class)
public class Product_ extends GenericEntity_ {
public static volatile SingularAttribute<Product, LanEvent> event;
public static volatile SingularAttribute<Product, String> color;
public static volatile SingularAttribute<Product, String> name;
public static volatile SingularAttribute<Product, String> description;
public static volatile SingularAttribute<Product, BigDecimal> price;
public static volatile SingularAttribute<Product, BigDecimal> buyInPrice;
public static volatile SingularAttribute<Product, Integer> sort;
public static volatile SingularAttribute<Product, String> barcode;
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, InventoryEvent> inventoryEvents;
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;
}
code/LanBortalDatabase/src/fi/insomnia/bortal/model/ReaderEvent_.java deleted 100644 → 0
package fi.insomnia.bortal.model;
import java.util.Date;
import javax.annotation.Generated;
import javax.persistence.metamodel.SingularAttribute;
import javax.persistence.metamodel.StaticMetamodel;
@Generated(value="Dali", date="2012-11-01T13:46:40.201+0200")
@StaticMetamodel(ReaderEvent.class)
public class ReaderEvent_ extends GenericEntity_ {
public static volatile SingularAttribute<ReaderEvent, Date> time;
public static volatile SingularAttribute<ReaderEvent, Date> updatetime;
public static volatile SingularAttribute<ReaderEvent, String> value;
public static volatile SingularAttribute<ReaderEvent, String> notes;
public static volatile SingularAttribute<ReaderEvent, Integer> gamePoint;
public static volatile SingularAttribute<ReaderEvent, PrintedCard> printedCard;
public static volatile SingularAttribute<ReaderEvent, Reader> reader;
}
code/LanBortalDatabase/src/fi/insomnia/bortal/model/Reader_.java deleted 100644 → 0
package fi.insomnia.bortal.model;
import fi.insomnia.bortal.model.salespoint.SalesEntity;
import java.math.BigDecimal;
import javax.annotation.Generated;
import javax.persistence.metamodel.ListAttribute;
import javax.persistence.metamodel.SingularAttribute;
import javax.persistence.metamodel.StaticMetamodel;
@Generated(value="Dali", date="2012-10-24T19:52:46.999+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;
public static volatile SingularAttribute<Reader, SalesEntity> salesEntity;
public static volatile SingularAttribute<Reader, Product> automaticProduct;
public static volatile SingularAttribute<Reader, BigDecimal> automaticProductCount;
public static volatile SingularAttribute<Reader, String> identification;
public static volatile SingularAttribute<Reader, String> description;
public static volatile SingularAttribute<Reader, Location> location;
public static volatile SingularAttribute<Reader, EventMap> eventMap;
public static volatile SingularAttribute<Reader, Integer> mapX;
public static volatile SingularAttribute<Reader, Integer> mapY;
public static volatile ListAttribute<Reader, ReaderEvent> events;
}
code/LanBortalDatabase/src/fi/insomnia/bortal/model/Role_.java deleted 100644 → 0
package fi.insomnia.bortal.model;
import javax.annotation.Generated;
import javax.persistence.metamodel.ListAttribute;
import javax.persistence.metamodel.SingularAttribute;
import javax.persistence.metamodel.StaticMetamodel;
@Generated(value="Dali", date="2012-10-24T19:52:47.008+0300")
@StaticMetamodel(Role.class)
public class Role_ extends GenericEntity_ {
public static volatile SingularAttribute<Role, String> name;
public static volatile ListAttribute<Role, EventUser> users;
public static volatile ListAttribute<Role, Role> children;
public static volatile ListAttribute<Role, Product> productsProvide;
public static volatile ListAttribute<Role, Place> placesProvide;
public static volatile ListAttribute<Role, Role> parents;
public static volatile ListAttribute<Role, ApplicationPermission> permissions;
public static volatile SingularAttribute<Role, CardTemplate> cardTemplate;
public static volatile ListAttribute<Role, Discount> discounts;
public static volatile ListAttribute<Role, NewsGroup> writeNews;
public static volatile ListAttribute<Role, NewsGroup> newsGroups;
public static volatile SingularAttribute<Role, LanEvent> event;
public static volatile ListAttribute<Role, OrgRole> orgRoles;
}
code/LanBortalDatabase/src/fi/insomnia/bortal/model/SitePage_.java deleted 100644 → 0
package fi.insomnia.bortal.model;
import javax.annotation.Generated;
import javax.persistence.metamodel.ListAttribute;
import javax.persistence.metamodel.SingularAttribute;
import javax.persistence.metamodel.StaticMetamodel;
@Generated(value="Dali", date="2012-10-24T19:52:47.021+0300")
@StaticMetamodel(SitePage.class)
public class SitePage_ extends GenericEntity_ {
public static volatile SingularAttribute<SitePage, LanEvent> event;
public static volatile SingularAttribute<SitePage, String> name;
public static volatile SingularAttribute<SitePage, SitePage> parent;
public static volatile ListAttribute<SitePage, Role> allowedRoles;
public static volatile ListAttribute<SitePage, SitePage> children;
public static volatile ListAttribute<SitePage, PageContent> contents;
}
code/LanBortalDatabase/src/fi/insomnia/bortal/model/UserImage_.java deleted 100644 → 0
package fi.insomnia.bortal.model;
import java.util.Calendar;
import javax.annotation.Generated;
import javax.persistence.metamodel.SingularAttribute;
import javax.persistence.metamodel.StaticMetamodel;
@Generated(value="Dali", date="2012-10-24T19:52:47.031+0300")
@StaticMetamodel(UserImage.class)
public class UserImage_ extends GenericEntity_ {
public static volatile SingularAttribute<UserImage, Calendar> uploaded;
public static volatile SingularAttribute<UserImage, String> name;
public static volatile SingularAttribute<UserImage, String> description;
public static volatile SingularAttribute<UserImage, String> mimeType;
public static volatile SingularAttribute<UserImage, byte[]> imageData;
public static volatile SingularAttribute<UserImage, User> user;
public static volatile SingularAttribute<UserImage, User> defaultImage;
}
code/LanBortalDatabase/src/fi/insomnia/bortal/model/UserNote_.java deleted 100644 → 0
package fi.insomnia.bortal.model;
import javax.annotation.Generated;
import javax.persistence.metamodel.SingularAttribute;
import javax.persistence.metamodel.StaticMetamodel;
@Generated(value="Dali", date="2012-10-24T19:52:47.035+0300")
@StaticMetamodel(UserNote.class)
public class UserNote_ extends GenericEntity_ {
public static volatile SingularAttribute<UserNote, EventUser> user;
public static volatile SingularAttribute<UserNote, String> content;
public static volatile SingularAttribute<UserNote, UserNoteType> notetype;
}
code/LanBortalDatabase/src/fi/insomnia/bortal/model/User_.java deleted 100644 → 0
package fi.insomnia.bortal.model;
import fi.insomnia.bortal.enums.Gender;
import java.util.Calendar;
import java.util.Date;
import javax.annotation.Generated;
import javax.persistence.metamodel.ListAttribute;
import javax.persistence.metamodel.SingularAttribute;
import javax.persistence.metamodel.StaticMetamodel;
@Generated(value="Dali", date="2012-10-24T19:52:47.025+0300")
@StaticMetamodel(User.class)
public class User_ extends GenericEntity_ {
public static volatile SingularAttribute<User, Calendar> created;
public static volatile SingularAttribute<User, String> login;
public static volatile SingularAttribute<User, Boolean> active;
public static volatile SingularAttribute<User, String> password;
public static volatile SingularAttribute<User, String> lastname;
public static volatile SingularAttribute<User, String> firstnames;
public static volatile SingularAttribute<User, Date> birthday;
public static volatile SingularAttribute<User, String> nick;
public static volatile SingularAttribute<User, String> email;
public static volatile SingularAttribute<User, String> address;
public static volatile SingularAttribute<User, String> zip;
public static volatile SingularAttribute<User, String> postalTown;
public static volatile SingularAttribute<User, String> town;
public static volatile SingularAttribute<User, String> phone;
public static volatile SingularAttribute<User, UserImage> currentImage;
public static volatile SingularAttribute<User, Gender> gender;
public static volatile SingularAttribute<User, String> confirmHash;
public static volatile SingularAttribute<User, Calendar> confirmTime;
public static volatile SingularAttribute<User, Boolean> superadmin;
public static volatile ListAttribute<User, UserImage> userImageList;
}
code/LanBortalDatabase/src/fi/insomnia/bortal/model/Vote_.java deleted 100644 → 0
package fi.insomnia.bortal.model;
import java.util.Calendar;
import javax.annotation.Generated;
import javax.persistence.metamodel.SingularAttribute;
import javax.persistence.metamodel.StaticMetamodel;
@Generated(value="Dali", date="2012-10-24T19:52:47.039+0300")
@StaticMetamodel(Vote.class)
public class Vote_ extends GenericEntity_ {
public static volatile SingularAttribute<Vote, Integer> score;
public static volatile SingularAttribute<Vote, String> message;
public static volatile SingularAttribute<Vote, Calendar> time;
public static volatile SingularAttribute<Vote, CompoEntry> compoEntry;
public static volatile SingularAttribute<Vote, EventUser> voter;
}
code/LanBortalDatabase/src/fi/insomnia/bortal/model/salespoint/SalesEntity_.java deleted 100644 → 0
package fi.insomnia.bortal.model.salespoint;
import fi.insomnia.bortal.model.GenericEntity_;
import fi.insomnia.bortal.model.Reader;
import javax.annotation.Generated;
import javax.persistence.metamodel.SingularAttribute;
import javax.persistence.metamodel.StaticMetamodel;
@Generated(value="Dali", date="2012-10-24T19:52:47.012+0300")
@StaticMetamodel(SalesEntity.class)
public class SalesEntity_ extends GenericEntity_ {
public static volatile SingularAttribute<SalesEntity, String> certificate;
public static volatile SingularAttribute<SalesEntity, String> name;
public static volatile SingularAttribute<SalesEntity, String> secret;
public static volatile SingularAttribute<SalesEntity, SalesEntityType> type;
public static volatile SingularAttribute<SalesEntity, Reader> reader;
public static volatile SingularAttribute<SalesEntity, Salespoint> point;
}
code/LanBortalDatabase/src/fi/insomnia/bortal/model/salespoint/Salespoint_.java deleted 100644 → 0
package fi.insomnia.bortal.model.salespoint;
import fi.insomnia.bortal.model.GenericEntity_;
import fi.insomnia.bortal.model.LanEvent;
import javax.annotation.Generated;
import javax.persistence.metamodel.ListAttribute;
import javax.persistence.metamodel.SingularAttribute;
import javax.persistence.metamodel.StaticMetamodel;
@Generated(value="Dali", date="2012-10-24T19:52:47.017+0300")
@StaticMetamodel(Salespoint.class)
public class Salespoint_ extends GenericEntity_ {
public static volatile SingularAttribute<Salespoint, LanEvent> event;
public static volatile SingularAttribute<Salespoint, String> name;
public static volatile SingularAttribute<Salespoint, String> description;
public static volatile ListAttribute<Salespoint, SalesEntity> entities;
}
code/LanBortalWeb/WebContent/admin/adduser/capturesuccess.xhtml deleted 100644 → 0
<!DOCTYPE html
PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core" xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:p="http://primefaces.org/ui" xmlns:shop="http://java.sun.com/jsf/composite/cditools/shop" xmlns:tools="http://java.sun.com/jsf/composite/cditools">
<h:body>
<ui:composition template="/layout/#{sessionHandler.adduserfullscreen}/template.xhtml">
<f:metadata>
<f:viewParam name="userid" value="#{userView.userid}" />
<f:event type="preRenderView" listener="#{userView.initView}" />
</f:metadata>
<ui:define name="topbar">
<h:link styleClass="userbackbutton" outcome="/admin/adduser/update">
<div>#{i18n['adduser.back']}</div>
</h:link>
</ui:define>
<ui:define name="content">
<h:form>
<div>
<h:panelGrid columns="2">
<h:panelGroup>
<h1>#{i18n["adduser.update"]}</h1>
<br />
<br />
<h:link styleClass="touchItem" outcome="/admin/adduser/update">
<div>#{i18n['adduser.newphoto']}</div>
</h:link>
<h:link styleClass="touchItem" outcome="/admin/adduser/start">
<div>#{i18n['adduser.tostart']}</div>
</h:link>
</h:panelGroup>
<h:panelGroup>
<h:outputText rendered="#{empty userView.user.currentImage}" value="#{i18n['user.noCurrentImage']}" />
<ui:fragment rendered="#{!empty userView.user.currentImage}">
<img style="width: 300px;" src="#{request.contextPath}/dydata/userimage/#{userView.user.currentImage.id}.img" alt="image" />
</ui:fragment>
</h:panelGroup>
</h:panelGrid>
</div>
</h:form>
</ui:define>
</ui:composition>
</h:body>
</html>
\ No newline at end of file
code/LanBortalWeb/WebContent/useradmin/export.xhtml deleted 100644 → 0
<!DOCTYPE html
PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:h="http://java.sun.com/jsf/html" xmlns:users="http://java.sun.com/jsf/composite/cditools/user" xmlns:tools="http://java.sun.com/jsf/composite/cditools" xmlns:p="http://primefaces.org/ui" xmlns:f="http://java.sun.com/jsf/core">
<h:body>
<f:metadata>
<f:event type="preRenderView" listener="#{placeGroupView.}" />
</f:metadata>
Etunimi;Sukunimi;Nick;Osoite;Kaupunki;Email;Puhelin;Konepaikat<br/>
<ui:repeat var="usr" value="#{userSearchView.eventUserResults}">#{usr.firstnames};#{usr.lastname};#{usr.nick};#{usr.address};#{usr.postalTown};#{usr.email};#{usr.phone};<ui:repeat var="places" value="#{usr.currentPlaces}">#{#places.name},</ui:repeat><br/></ui:repeat>
</h:body>
</html>
\ No newline at end of file
code/moya-beans-client/ejbModule/fi/codecrew/moya/beans/CardTemplateBeanLocal.java
...@@ -82,4 +82,6 @@ public interface CardTemplateBeanLocal extends EntityFinderBean<CardTemplate> { ...@@ -82,4 +82,6 @@ public interface CardTemplateBeanLocal extends EntityFinderBean<CardTemplate> {
EventUser giveCard(EventUser user, boolean markUserPlacesDelivered); EventUser giveCard(EventUser user, boolean markUserPlacesDelivered);
void removeCardCode(CardCode code); void removeCardCode(CardCode code);
CardTemplate removeCardObjectData(CardObjectData data);
CardTemplate removeCardTextData(CardTextData data);
} }
code/moya-beans/ejbModule/fi/codecrew/moya/beans/BarcodeBean.java
...@@ -328,6 +328,12 @@ public class BarcodeBean implements BarcodeBeanLocal { ...@@ -328,6 +328,12 @@ public class BarcodeBean implements BarcodeBeanLocal {
Place place = placeFacade.find(id); Place place = placeFacade.find(id);
return place; return place;
} else if(barcode.contains(PLACE_TEXTCODEPREFIX)) {
String trimmedBarcode = barcode.substring(barcode.indexOf(PLACE_TEXTCODEPREFIX));
int id = Integer.parseInt(trimmedBarcode.substring(PLACE_TEXTCODEPREFIX.length(), trimmedBarcode.length()));
Place place = placeFacade.find(id);
return place;
} }
} catch (NumberFormatException x) { } catch (NumberFormatException x) {
} }
...@@ -347,6 +353,13 @@ public class BarcodeBean implements BarcodeBeanLocal { ...@@ -347,6 +353,13 @@ public class BarcodeBean implements BarcodeBeanLocal {
if (card != null) if (card != null)
return card; return card;
} else if(barcode.contains(PRINTED_CARD_BARCODEPREFIX)) {
String trimmedBarcode = barcode.substring(barcode.indexOf(PRINTED_CARD_BARCODEPREFIX));
int id = Integer.parseInt(trimmedBarcode.substring(3, trimmedBarcode.length() - 1));
PrintedCard card = printedCardFacade.find(id);
if (card != null)
return card;
} }
} catch (NumberFormatException x) { } catch (NumberFormatException x) {
} }
...@@ -375,6 +388,13 @@ public class BarcodeBean implements BarcodeBeanLocal { ...@@ -375,6 +388,13 @@ public class BarcodeBean implements BarcodeBeanLocal {
EventUser user = userBean.findByEventUserId(id); EventUser user = userBean.findByEventUserId(id);
return user; return user;
} else if(barcode.contains(EVENTUSER_BARCODEPREFIX)) {
String trimmedBarcode = barcode.substring(barcode.indexOf(EVENTUSER_BARCODEPREFIX));
int id = Integer.parseInt(trimmedBarcode.substring(3, trimmedBarcode.length() - 1));
logger.debug("finding user with barcode {} and id {}", trimmedBarcode, id);
EventUser user = userBean.findByEventUserId(id);
return user;
} }
// try if it is our Eticket -code // try if it is our Eticket -code
......
code/moya-beans/ejbModule/fi/codecrew/moya/beans/CardPrintBean.java
...@@ -482,46 +482,44 @@ public class CardPrintBean implements CardPrintBeanLocal { ...@@ -482,46 +482,44 @@ public class CardPrintBean implements CardPrintBeanLocal {
} else { } else {
font = new Font(textData.getFontName(), Font.PLAIN, textData.getSize().intValue()); font = new Font(textData.getFontName(), Font.PLAIN, textData.getSize().intValue());
} }
logger.info("TextData fontname: " + textData.getFontName());
logger.info("Font: " + font.getFontName());
g.setColor(color); g.setColor(color);
g.setFont(font); g.setFont(font);
int x = textData.getX(); int x = textData.getX();
int y = textData.getY(); int y = textData.getY();
String text = "";
if(textData.getTextAlignment() == CardTextAlignment.CENTER) {
int width = g.getFontMetrics().charsWidth(user.getUser().getNick().toCharArray(), 0, user.getUser().getNick().length());
x -= width/2;
} else if(textData.getTextAlignment() == CardTextAlignment.RIGHT) {
int width = g.getFontMetrics().charsWidth(user.getUser().getNick().toCharArray(), 0, user.getUser().getNick().length());
x -= width;
}
if(textData.getTextDataType() == CardTextDataType.NICK) { if(textData.getTextDataType() == CardTextDataType.NICK) {
logger.info("Drawing nick to card."); text = user.getUser().getNick();
g.drawString(user.getUser().getNick(), x, y);
} else if(textData.getTextDataType() == CardTextDataType.FIRSTNAME) { } else if(textData.getTextDataType() == CardTextDataType.FIRSTNAME) {
logger.info("Drawing firstname to card."); text = user.getUser().getFirstnames();
g.drawString(user.getUser().getFirstnames(), x, y);
} else if(textData.getTextDataType() == CardTextDataType.LASTNAME) { } else if(textData.getTextDataType() == CardTextDataType.LASTNAME) {
logger.info("Drawing lastname to card."); text = user.getUser().getLastname();
g.drawString(user.getUser().getLastname(), x, y);
} else if(textData.getTextDataType() == CardTextDataType.WHOLENAME) { } else if(textData.getTextDataType() == CardTextDataType.WHOLENAME) {
logger.info("Drawing wholename to card."); text = user.getUser().getFirstnames() + " " + user.getUser().getLastname();
String wholename = user.getUser().getFirstnames() + " " + user.getUser().getLastname();
g.drawString(wholename, x, y);
} else if(textData.getTextDataType() == CardTextDataType.AGE) { } else if(textData.getTextDataType() == CardTextDataType.AGE) {
logger.info("Drawing age to card."); text = user.getUser().getAge().toString();
g.drawString(user.getUser().getAge().toString(), x, y);
} else if(textData.getTextDataType() == CardTextDataType.ROLE) { } else if(textData.getTextDataType() == CardTextDataType.ROLE) {
logger.info("Drawing cards templates name to card."); text = card.getTemplate().getName();
g.drawString(card.getTemplate().getName(), x, y);
} else if(textData.getTextDataType() == CardTextDataType.STATIC) { } else if(textData.getTextDataType() == CardTextDataType.STATIC) {
logger.info("Drawing static text '" + textData.getText() + "' to card."); text = textData.getText();
g.drawString(textData.getText(), x, y);
} else if(textData.getTextDataType() == CardTextDataType.AUTHCODE) { } else if(textData.getTextDataType() == CardTextDataType.AUTHCODE) {
logger.info("Drawing auth code text '" + textData.getText() + "' to card."); text = userBean.getAuthCode(user);
g.drawString(userBean.getAuthCode(user), x, y); }
if(textData.getTextAlignment() == CardTextAlignment.CENTER) {
int width = g.getFontMetrics().charsWidth(text.toCharArray(), 0, text.length());
x -= width/2;
} else if(textData.getTextAlignment() == CardTextAlignment.RIGHT) {
int width = g.getFontMetrics().charsWidth(text.toCharArray(), 0, text.length());
x -= width;
}
if(!text.equals("")) {
g.drawString(text, x, y);
} }
} else if(objectData != null) { } else if(objectData != null) {
......
code/moya-beans/ejbModule/fi/codecrew/moya/beans/CardTemplateBean.java
...@@ -421,5 +421,21 @@ public class CardTemplateBean implements CardTemplateBeanLocal { ...@@ -421,5 +421,21 @@ public class CardTemplateBean implements CardTemplateBeanLocal {
cardCodeFacade.remove(code); cardCodeFacade.remove(code);
} }
@Override
public CardTemplate removeCardTextData(CardTextData data) {
data = ctdFacade.reload(data);
CardTemplate template = data.getCardTemplate();
ctdFacade.remove(data);
return template;
}
@Override
public CardTemplate removeCardObjectData(CardObjectData data) {
data = codFacade.reload(data);
CardTemplate template = data.getCardTemplate();
codFacade.remove(data);
return template;
}
} }
code/moya-web/WebContent/useradmin/cloneCardTemplate.xhtml 0 → 100644
<!DOCTYPE html
PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xmlns:ui="http://java.sun.com/jsf/facelets"
xmlns:h="http://java.sun.com/jsf/html" xmlns:users="http://java.sun.com/jsf/composite/tools/user"
xmlns:f="http://java.sun.com/jsf/core"
>
<h:body>
<ui:composition template="#{sessionHandler.template}">
<f:metadata>
<f:event type="preRenderView" listener="#{cardView.initCardClone}" />
<f:viewParam name="clonedtemplateid" value="#{cardView.clonedTemplateId}" />
</f:metadata>
<ui:define name="content">
<h:form id="cardTemplates">
<h:panelGrid columns="2">
<h:outputLabel value="#{i18n['cardTemplate.name']}:" />
<h:inputText value="#{cardView.cardTemplate.name}" />
<h:outputLabel value="#{i18n['cardTemplate.power']}:" />
<h:inputText value="#{cardView.cardTemplate.power}" size="4" />
</h:panelGrid>
<h:commandButton action="#{cardView.cloneTemplate()}" value="#{i18n['cardTemplate.create']}" />
</h:form>
</ui:define>
</ui:composition>
</h:body>
</html>
\ No newline at end of file
code/moya-web/WebContent/useradmin/deleteCardTextData.xhtml 0 → 100644
<!DOCTYPE html
PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:h="http://java.sun.com/jsf/html" xmlns:users="http://java.sun.com/jsf/composite/tools/user"
xmlns:f="http://java.sun.com/jsf/core" xmlns:p="http://primefaces.org/ui">
<h:body>
<ui:composition template="#{sessionHandler.template}">
<f:metadata>
<f:viewParam name="textdataid" value="#{cardTemplateDataEditView.cardTextDataId}" />
<f:viewParam name="objectdataid" value="#{cardTemplateDataEditView.cardObjectDataId}" />
<f:event type="preRenderView" listener="#{cardTemplateDataEditView.initView()}" />
</f:metadata>
<ui:define name="content">
<h:form id="cardTemplates">
<h:panelGrid columns="1">
<h:outputLabel rendered="#{!empty cardTemplateDataEditView.cardTextData}" value="#{i18n['cardTextData.deleteQ']}" />
<h:outputLabel rendered="#{!empty cardTemplateDataEditView.cardObjectData}" value="#{i18n['cardObjectData.deleteQ']}" />
</h:panelGrid>
<h:commandButton rendered="#{!empty cardTemplateDataEditView.cardTextData}" action="#{cardTemplateDataEditView.deleteTextData()}" value="#{i18n['cardTextData.delete']}" />
<h:commandButton rendered="#{!empty cardTemplateDataEditView.cardObjectData}" action="#{cardTemplateDataEditView.deleteObjectData()}" value="#{i18n['cardObjectData.delete']}" />
</h:form>
</ui:define>
</ui:composition>
</h:body>
</html>
\ No newline at end of file
code/moya-web/WebContent/useradmin/listCardTemplateData.xhtml
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xmlns:ui="http://java.sun.com/jsf/facelets" <html xmlns="http://www.w3.org/1999/xhtml" xmlns:ui="http://java.sun.com/jsf/facelets"
xmlns:h="http://java.sun.com/jsf/html" xmlns:users="http://java.sun.com/jsf/composite/tools/user" xmlns:h="http://java.sun.com/jsf/html" xmlns:users="http://java.sun.com/jsf/composite/tools/user"
xmlns:f="http://java.sun.com/jsf/core" xmlns:f="http://java.sun.com/jsf/core" xmlns:p="http://primefaces.org/ui"
> >
<h:body> <h:body>
<ui:composition template="#{sessionHandler.template}"> <ui:composition template="#{sessionHandler.template}">
...@@ -53,6 +53,15 @@ ...@@ -53,6 +53,15 @@
<f:param name="textdataid" value="#{textData.id}" /> <f:param name="textdataid" value="#{textData.id}" />
</h:link> </h:link>
</h:column> </h:column>
<h:column>
<p:commandButton id="DeleteText#{textData.id}" value="Delete" onclick="PF('dialogText#{textData.id}').show();" type="button" onerror="location.reload(true);" />
<p:dialog id="deleteDialog" widgetVar="dialogText#{textData.id}" width="300" position="center">
<h:panelGrid>
<h:outputLabel value="#{i18n['cardTextData.deleteQ']}"></h:outputLabel>
<h:commandButton action="#{cardTemplateDataView.deleteTextData(textData.id)}" value="#{i18n['cardTextData.delete']}" oncomplete="PF('dialogText#{textData.id}').hide()"/>
</h:panelGrid>
</p:dialog>
</h:column>
</h:dataTable> </h:dataTable>
<h:dataTable rendered="#{!empty cardTemplateDataView.cardObjectDatas}" value="#{cardTemplateDataView.cardObjectDatas}" var="objectData"> <h:dataTable rendered="#{!empty cardTemplateDataView.cardObjectDatas}" value="#{cardTemplateDataView.cardObjectDatas}" var="objectData">
<h:column> <h:column>
...@@ -94,6 +103,15 @@ ...@@ -94,6 +103,15 @@
<f:param name="objectdataid" value="#{objectData.id}" /> <f:param name="objectdataid" value="#{objectData.id}" />
</h:link> </h:link>
</h:column> </h:column>
<h:column>
<p:commandButton id="DeleteObject#{objectData.id}" value="Delete" onclick="PF('dialogObject#{objectData.id}').show();" type="button" onerror="location.reload(true);" />
<p:dialog id="deleteObjectDataDialog" for="image" widgetVar="dialogObject#{objectData.id}" width="300" position="left">
<h:panelGrid>
<h:outputLabel value="#{i18n['cardTextData.deleteQ']}"></h:outputLabel>
<h:commandButton action="#{cardTemplateDataView.deleteTextData(objectData.id)}" value="#{i18n['cardObjectData.delete']}" oncomplete="PF('dialogObject#{objectData.id}').hide()"/>
</h:panelGrid>
</p:dialog>
</h:column>
</h:dataTable> </h:dataTable>
</h:form> </h:form>
......
code/moya-web/WebContent/useradmin/listCardTemplates.xhtml
...@@ -47,6 +47,11 @@ ...@@ -47,6 +47,11 @@
</h:link> </h:link>
</h:column> </h:column>
<h:column> <h:column>
<h:link outcome="/useradmin/cloneCardTemplate" value="#{i18n['cardTemplate.clone']}">
<f:param name="clonedtemplateid" value="#{card.id}" />
</h:link>
</h:column>
<h:column>
<h:link outcome="/useradmin/editCardTextData" value="#{i18n['cardTextData.create']}"> <h:link outcome="/useradmin/editCardTextData" value="#{i18n['cardTextData.create']}">
<f:param name="templateid" value="#{card.id}" /> <f:param name="templateid" value="#{card.id}" />
<f:param name="createobjecttype" value="#{cardView.textDataType}" /> <f:param name="createobjecttype" value="#{cardView.textDataType}" />
......
code/moya-web/src/main/java/fi/codecrew/moya/web/cdiview/card/CardTemplateDataEditView.java
...@@ -178,6 +178,42 @@ public class CardTemplateDataEditView extends GenericCDIView { ...@@ -178,6 +178,42 @@ public class CardTemplateDataEditView extends GenericCDIView {
} }
} }
public String deleteObjectData() {
if(this.cardObjectData != null) {
setCardTemplate(cfbean.removeCardObjectData(this.cardObjectData));
}
else
logger.info("CardObjectData is null!");
return "/useradmin/listCardTemplateData";
}
public String deleteTextData() {
if(this.cardTextData != null) {
setCardTemplate(cfbean.removeCardTextData(this.cardTextData));
}
else
logger.info("CardTextData is null!");
return "/useradmin/listCardTemplateData";
}
public String deleteObjectData(Integer objectDataId) {
if(this.cardObjectData != null) {
setCardTemplate(cfbean.removeCardObjectData(cfbean.findObjectData(objectDataId)));
}
else
logger.info("CardObjectData is null!");
return "/useradmin/listCardTemplateData";
}
public String deleteTextData(Integer textDataId) {
if(this.cardTextData != null) {
setCardTemplate(cfbean.removeCardTextData(cfbean.findTextData(textDataId)));
}
else
logger.info("CardTextData is null!");
return "/useradmin/listCardTemplateData";
}
public String localisedLabel(String text, String type) { public String localisedLabel(String text, String type) {
return I18n.get(text + type); return I18n.get(text + type);
} }
......
code/moya-web/src/main/java/fi/codecrew/moya/web/cdiview/card/CardTemplateDataView.java
...@@ -26,6 +26,9 @@ import javax.enterprise.context.ConversationScoped; ...@@ -26,6 +26,9 @@ import javax.enterprise.context.ConversationScoped;
import javax.inject.Named; import javax.inject.Named;
import javax.json.Json; import javax.json.Json;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import fi.codecrew.moya.beans.CardTemplateBeanLocal; import fi.codecrew.moya.beans.CardTemplateBeanLocal;
import fi.codecrew.moya.enums.apps.UserPermission; import fi.codecrew.moya.enums.apps.UserPermission;
import fi.codecrew.moya.model.CardObjectData; import fi.codecrew.moya.model.CardObjectData;
...@@ -38,6 +41,7 @@ import fi.codecrew.moya.web.cdiview.GenericCDIView; ...@@ -38,6 +41,7 @@ import fi.codecrew.moya.web.cdiview.GenericCDIView;
public class CardTemplateDataView extends GenericCDIView { public class CardTemplateDataView extends GenericCDIView {
private static final long serialVersionUID = -9115983838324313414L; private static final long serialVersionUID = -9115983838324313414L;
private static final Logger logger = LoggerFactory.getLogger(CardTemplateDataEditView.class);
private Integer templateId = 0; private Integer templateId = 0;
private Integer cardTextDataId = 0; private Integer cardTextDataId = 0;
...@@ -71,6 +75,28 @@ public class CardTemplateDataView extends GenericCDIView { ...@@ -71,6 +75,28 @@ public class CardTemplateDataView extends GenericCDIView {
} }
} }
public String deleteObjectData(Integer objectDataId) {
CardObjectData data = cfbean.findObjectData(objectDataId);
if(data != null) {
cardObjectDatas.remove(data);
setCardTemplate(cfbean.removeCardObjectData(data));
}
else
logger.info("CardObjectData is null!");
return "/useradmin/listCardTemplateData";
}
public String deleteTextData(Integer textDataId) {
CardTextData data = cfbean.findTextData(textDataId);
if(data != null) {
cardTextDatas.remove(data);
setCardTemplate(cfbean.removeCardTextData(data));
}
else
logger.info("CardTextData is null!");
return "/useradmin/listCardTemplateData";
}
public String saveTextData() { public String saveTextData() {
//if(cardTextData.getMeta() == null) //if(cardTextData.getMeta() == null)
// cardTextData.setMeta(Json.createObjectBuilder().build()); // cardTextData.setMeta(Json.createObjectBuilder().build());
......
code/moya-web/src/main/java/fi/codecrew/moya/web/cdiview/user/CardView.java
...@@ -34,8 +34,12 @@ import org.slf4j.LoggerFactory; ...@@ -34,8 +34,12 @@ import org.slf4j.LoggerFactory;
import fi.codecrew.moya.beans.CardTemplateBeanLocal; import fi.codecrew.moya.beans.CardTemplateBeanLocal;
import fi.codecrew.moya.beans.EventBeanLocal; import fi.codecrew.moya.beans.EventBeanLocal;
import fi.codecrew.moya.enums.CardTemplateDataType; import fi.codecrew.moya.enums.CardTemplateDataType;
import fi.codecrew.moya.enums.CardTextAlignment;
import fi.codecrew.moya.enums.CardTextDataType;
import fi.codecrew.moya.enums.apps.UserPermission; import fi.codecrew.moya.enums.apps.UserPermission;
import fi.codecrew.moya.model.CardObjectData;
import fi.codecrew.moya.model.CardTemplate; import fi.codecrew.moya.model.CardTemplate;
import fi.codecrew.moya.model.CardTextData;
import fi.codecrew.moya.model.EventUser; import fi.codecrew.moya.model.EventUser;
import fi.codecrew.moya.utilities.I18n; import fi.codecrew.moya.utilities.I18n;
import fi.codecrew.moya.web.annotations.SelectedUser; import fi.codecrew.moya.web.annotations.SelectedUser;
...@@ -66,6 +70,8 @@ public class CardView extends GenericCDIView { ...@@ -66,6 +70,8 @@ public class CardView extends GenericCDIView {
private static final Logger logger = LoggerFactory.getLogger(CardView.class); private static final Logger logger = LoggerFactory.getLogger(CardView.class);
private Integer clonedTemplateId;
public void initCardCreate() { public void initCardCreate() {
if (super.requirePermissions(UserPermission.WRITE_ROLES)) if (super.requirePermissions(UserPermission.WRITE_ROLES))
{ {
...@@ -73,6 +79,18 @@ public class CardView extends GenericCDIView { ...@@ -73,6 +79,18 @@ public class CardView extends GenericCDIView {
super.beginConversation(); super.beginConversation();
} }
} }
public void initCardClone() {
if (super.requirePermissions(UserPermission.WRITE_ROLES))
{
CardTemplate clonedTemplate = cfbean.find(clonedTemplateId);
setCardTemplate(new CardTemplate(eventBean.getCurrentEvent()));
cardTemplate.setPower(clonedTemplate.getPower());
cardTemplate.setImage(clonedTemplate.getImage());
cardTemplate.setRoles(clonedTemplate.getRoles());
super.beginConversation();
}
}
public String saveImage() public String saveImage()
{ {
...@@ -145,6 +163,52 @@ public class CardView extends GenericCDIView { ...@@ -145,6 +163,52 @@ public class CardView extends GenericCDIView {
return "/useradmin/listCardTemplates"; return "/useradmin/listCardTemplates";
} }
public String cloneTemplate() {
if(clonedTemplateId != 0) {
CardTemplate srcTemplate = cfbean.find(clonedTemplateId);
cfbean.create(getCardTemplate());
CardTemplate dstTemplate = getCardTemplate();
List<CardObjectData> srcObjectDatas = cfbean.findCardObjectDatas(srcTemplate);
List<CardTextData> srcTextDatas = cfbean.findCardTextDatas(srcTemplate);
for (CardTextData cardTextData : srcTextDatas) {
CardTextData dstTextData = new CardTextData();
dstTextData.setCardTemplate(dstTemplate);
dstTextData.setFontColorB(cardTextData.getFontColorB());
dstTextData.setFontColorG(cardTextData.getFontColorG());
dstTextData.setFontColorR(cardTextData.getFontColorR());
dstTextData.setFont(cardTextData.getFont());
dstTextData.setFontStyle(cardTextData.getFontStyle());
dstTextData.setSize(cardTextData.getSize());
if(cardTextData.getText() != null && !cardTextData.getText().equals(""))
dstTextData.setText(cardTextData.getText());
dstTextData.setTextAlignment(cardTextData.getTextAlignment());
dstTextData.setTextDataType(cardTextData.getTextDataType());
dstTextData.setX(cardTextData.getX());
dstTextData.setY(cardTextData.getY());
dstTextData.setzIndex(cardTextData.getzIndex());
logger.info("Saving cardTextData for cloned cardTemplate");
dstTextData = cfbean.save(dstTextData);
}
for (CardObjectData cardObjectData : srcObjectDatas) {
CardObjectData dstObjectData = new CardObjectData();
dstObjectData.setCardTemplate(dstTemplate);
dstObjectData.setSize(cardObjectData.getSize());
dstObjectData.setObjectDataType(cardObjectData.getObjectDataType());
dstObjectData.setX(cardObjectData.getX());
dstObjectData.setY(cardObjectData.getY());
dstObjectData.setzIndex(cardObjectData.getzIndex());
logger.info("Saving cardObjectData for cloned cardTemplate");
dstObjectData = cfbean.save(dstObjectData);
}
cardTemplates = getCardTemplate().getEvent().getCardTemplates();
}
return "/useradmin/listCardTemplates";
}
public String saveTemplate() public String saveTemplate()
{ {
cardTemplate = cfbean.save(cardTemplate); cardTemplate = cfbean.save(cardTemplate);
...@@ -198,4 +262,13 @@ public class CardView extends GenericCDIView { ...@@ -198,4 +262,13 @@ public class CardView extends GenericCDIView {
public CardTemplateDataType getObjectDataType() { public CardTemplateDataType getObjectDataType() {
return CardTemplateDataType.OBJECT_DATA; return CardTemplateDataType.OBJECT_DATA;
} }
public Integer getClonedTemplateId() {
return clonedTemplateId;
}
public void setClonedTemplateId(Integer clonedTemplateId) {
this.clonedTemplateId = clonedTemplateId;
}
} }
code/moya-web/src/main/resources/fi/codecrew/moya/resources/i18n.properties
...@@ -511,3 +511,8 @@ yes = Kyll\u00E4 ...@@ -511,3 +511,8 @@ yes = Kyll\u00E4
vip.backToList=Takaisin listaukseen vip.backToList=Takaisin listaukseen
submenu.info.viplist=Vippilista submenu.info.viplist=Vippilista
submenu.info.usermapsearch=Karttahaku submenu.info.usermapsearch=Karttahaku
cardTemplate.clone=Clone
cardObjectData.deleteQ=Delete object data from card template?
cardTextData.deleteQ=Delete text data from card template?
cardObjectData.delete=Delete
cardTextData.delete=Delete
code/moya-web/src/main/resources/fi/codecrew/moya/resources/i18n_en.properties
...@@ -1728,3 +1728,8 @@ yes = Yes ...@@ -1728,3 +1728,8 @@ yes = Yes
vip.backToList=Back to viplist list vip.backToList=Back to viplist list
submenu.info.viplist=Viplist submenu.info.viplist=Viplist
submenu.info.usermapsearch=Mapsearch submenu.info.usermapsearch=Mapsearch
cardTemplate.clone=Clone
cardObjectData.deleteQ=Delete object data from card template?
cardTextData.deleteQ=Delete text data from card template?
cardObjectData.delete=Delete
cardTextData.delete=Delete
code/moya-web/src/main/resources/fi/codecrew/moya/resources/i18n_fi.properties
...@@ -1711,3 +1711,8 @@ yes = Kyll\u00E4 ...@@ -1711,3 +1711,8 @@ yes = Kyll\u00E4
vip.backToList=Takaisin listaukseen vip.backToList=Takaisin listaukseen
submenu.info.viplist=Vippilista submenu.info.viplist=Vippilista
submenu.info.usermapsearch=Karttahaku submenu.info.usermapsearch=Karttahaku
cardTemplate.clone=Kopioi
cardObjectData.deleteQ=Poistetaanko objektidata korttipohjalta?
cardTextData.deleteQ=Poistetaanko tekstidata korttipohjalta?
cardObjectData.delete=Poista
cardTextData.delete=Poista
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!