Skip to content

Antti Väyrynen / Moya

Go to a project
Commit 6249c3aa by Tuukka Kivilahti, TKffTK
Options

Merge branch 'master' of codecrew.fi:bortal 

Conflicts:
	code/LanBortalDatabase/src/fi/insomnia/bortal/model/AccountEvent_.java
	code/LanBortalDatabase/src/fi/insomnia/bortal/model/ActionLogMessageResponse_.java
	code/LanBortalDatabase/src/fi/insomnia/bortal/model/ActionLogMessage_.java
	code/LanBortalDatabase/src/fi/insomnia/bortal/model/ApplicationPermission_.java
	code/LanBortalDatabase/src/fi/insomnia/bortal/model/BillLine_.java
	code/LanBortalDatabase/src/fi/insomnia/bortal/model/Bill_.java
	code/LanBortalDatabase/src/fi/insomnia/bortal/model/CardTemplate_.java
	code/LanBortalDatabase/src/fi/insomnia/bortal/model/CompoEntryFile_.java
	code/LanBortalDatabase/src/fi/insomnia/bortal/model/CompoEntryParticipant_.java
	code/LanBortalDatabase/src/fi/insomnia/bortal/model/CompoEntry_.java
	code/LanBortalDatabase/src/fi/insomnia/bortal/model/Compo_.java
	code/LanBortalDatabase/src/fi/insomnia/bortal/model/DiscountInstance_.java
	code/LanBortalDatabase/src/fi/insomnia/bortal/model/Discount_.java
	code/LanBortalDatabase/src/fi/insomnia/bortal/model/EntityEquals_.java
	code/LanBortalDatabase/src/fi/insomnia/bortal/model/EventMap_.java
	code/LanBortalDatabase/src/fi/insomnia/bortal/model/EventOrganiser_.java
	code/LanBortalDatabase/src/fi/insomnia/bortal/model/EventUser_.java
	code/LanBortalDatabase/src/fi/insomnia/bortal/model/FoodWaveTemplate_.java
	code/LanBortalDatabase/src/fi/insomnia/bortal/model/FoodWave_.java
	code/LanBortalDatabase/src/fi/insomnia/bortal/model/GenericEntity_.java
	code/LanBortalDatabase/src/fi/insomnia/bortal/model/GroupMembership_.java
	code/LanBortalDatabase/src/fi/insomnia/bortal/model/LanEventDomain_.java
	code/LanBortalDatabase/src/fi/insomnia/bortal/model/LanEventPrivateProperty_.java
	code/LanBortalDatabase/src/fi/insomnia/bortal/model/LanEventProperty_.java
	code/LanBortalDatabase/src/fi/insomnia/bortal/model/LanEvent_.java
	code/LanBortalDatabase/src/fi/insomnia/bortal/model/Location_.java
	code/LanBortalDatabase/src/fi/insomnia/bortal/model/LogEntryType_.java
	code/LanBortalDatabase/src/fi/insomnia/bortal/model/LogEntry_.java
	code/LanBortalDatabase/src/fi/insomnia/bortal/model/MenuNavigation_.java
	code/LanBortalDatabase/src/fi/insomnia/bortal/model/Menuitem_.java
	code/LanBortalDatabase/src/fi/insomnia/bortal/model/NewsGroup_.java
	code/LanBortalDatabase/src/fi/insomnia/bortal/model/News_.java
	code/LanBortalDatabase/src/fi/insomnia/bortal/model/OrgRole_.java
	code/LanBortalDatabase/src/fi/insomnia/bortal/model/PageContent_.java
	code/LanBortalDatabase/src/fi/insomnia/bortal/model/PlaceGroup_.java
	code/LanBortalDatabase/src/fi/insomnia/bortal/model/Place_.java
	code/LanBortalDatabase/src/fi/insomnia/bortal/model/PollAnswer_.java
	code/LanBortalDatabase/src/fi/insomnia/bortal/model/PollQuestion_.java
	code/LanBortalDatabase/src/fi/insomnia/bortal/model/Poll_.java
	code/LanBortalDatabase/src/fi/insomnia/bortal/model/PossibleAnswer_.java
	code/LanBortalDatabase/src/fi/insomnia/bortal/model/PrintedCard_.java
	code/LanBortalDatabase/src/fi/insomnia/bortal/model/ProductLimitation_.java
	code/LanBortalDatabase/src/fi/insomnia/bortal/model/Product_.java
	code/LanBortalDatabase/src/fi/insomnia/bortal/model/ReaderEvent_.java
	code/LanBortalDatabase/src/fi/insomnia/bortal/model/Reader_.java
	code/LanBortalDatabase/src/fi/insomnia/bortal/model/Role_.java
	code/LanBortalDatabase/src/fi/insomnia/bortal/model/SitePage_.java
	code/LanBortalDatabase/src/fi/insomnia/bortal/model/UserImage_.java
	code/LanBortalDatabase/src/fi/insomnia/bortal/model/UserNote_.java
	code/LanBortalDatabase/src/fi/insomnia/bortal/model/User_.java
	code/LanBortalDatabase/src/fi/insomnia/bortal/model/Vote_.java
	code/LanBortalDatabase/src/fi/insomnia/bortal/model/salespoint/SalesEntity_.java
	code/LanBortalDatabase/src/fi/insomnia/bortal/model/salespoint/Salespoint_.java
2 parents 5a6395fe a0290f82
Expand all
Inline Side-by-side
Showing with 284 additions and 1161 deletions
.gitignore
...@@ -2,5 +2,6 @@ ...@@ -2,5 +2,6 @@
*.class *.class
.DS_Store .DS_Store
/code/LanBortal/EarContent/lib/LanBortalDatabase.jar /code/LanBortal/EarContent/lib/LanBortalDatabase.jar
/code/LanBortalDatabase/src/fi/insomnia/bortal/model/*_.java
/code/LanBortalDatabase/src/fi/insomnia/bortal/model/*/*_.java
*~ *~
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-06T21:46:36.160+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, 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-06T21:46:36.199+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-06T21:46:36.193+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-06T21:46:36.204+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-06T21:46:36.216+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;
}
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-06T21:46:36.210+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/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-06T21:46:36.222+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-06T21:46:36.238+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-06T21:46:36.243+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-06T21:46:36.233+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-06T21:46:36.227+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-06T21:46:36.255+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-06T21:46:36.249+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-06T21:46:36.260+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-06T21:46:36.287+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-06T21:46:36.294+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-06T21:46:36.299+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/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-10-06T21:46:36.310+0300")
@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;
}
code/LanBortalDatabase/src/fi/insomnia/bortal/model/FoodWave_.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-06T21:46:36.305+0300")
@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, Calendar> time;
public static volatile SingularAttribute<FoodWave, Boolean> closed;
public static volatile ListAttribute<FoodWave, AccountEvent> accountEvents;
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-06T21:46:36.315+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-06T21:46:36.319+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/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-06T21:46:36.338+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-06T21:46:36.346+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-06T21:46:36.352+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-06T21:46:36.328+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-06T21:46:36.358+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-06T21:46:36.370+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-06T21:46:36.364+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-06T21:46:36.380+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-06T21:46:36.375+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-06T21:46:36.390+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-06T21:46:36.385+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-06T21:46:36.395+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-06T21:46:36.401+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-06T21:46:36.413+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-06T21:46:36.407+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-06T21:46:36.424+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-06T21:46:36.430+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-06T21:46:36.419+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-06T21:46:36.436+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-06T21:46:36.442+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-06T21:46:36.460+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-10-06T21:53:06.901+0300")
@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, BigDecimal> price;
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, 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.Calendar;
import javax.annotation.Generated;
import javax.persistence.metamodel.SingularAttribute;
import javax.persistence.metamodel.StaticMetamodel;
@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;
public static volatile SingularAttribute<ReaderEvent, Calendar> 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 javax.annotation.Generated;
import javax.persistence.metamodel.ListAttribute;
import javax.persistence.metamodel.SingularAttribute;
import javax.persistence.metamodel.StaticMetamodel;
@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;
public static volatile SingularAttribute<Reader, SalesEntity> salesEntity;
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-06T21:46:36.481+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-06T21:46:36.497+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-06T21:46:36.512+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-06T21:46:36.520+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-06T21:46:36.503+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-06T21:46:36.527+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-06T21:46:36.485+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-06T21:46:36.491+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/layout/template1/template.xhtml
...@@ -22,9 +22,7 @@ ...@@ -22,9 +22,7 @@
<h:body> <h:body>
<div id="page-container"> <div id="page-container">
<div id="logo">
<div id="page-header">
<div id="logo">
<h:link outcome="/index"> <h:link outcome="/index">
<c:choose> <c:choose>
<c:when test="#{sessionHandler.isInDevelopmentMode()}"> <c:when test="#{sessionHandler.isInDevelopmentMode()}">
...@@ -37,14 +35,14 @@ ...@@ -37,14 +35,14 @@
<h:outputText value="#{layoutView.headertext}" /> <h:outputText value="#{layoutView.headertext}" />
</h1> </h1>
</ui:fragment> </ui:fragment>
<!-- <img src="#{request.contextPath}/resources/style/insomnia2/img/logo.png" />
<h1>STREAM INTRA</h1> -->
</c:otherwise> </c:otherwise>
</c:choose> </c:choose>
</h:link> </h:link>
</div> </div>
<div id="page-header">
<div id="login"> <div id="login">
<h:outputText rendered="#{sessionHandler.loggedIn}" value="#{i18n['template.loggedInAs']} #{sessionHandler.currentUser.nick}" /> <h:outputText rendered="#{sessionHandler.loggedIn}" value="#{i18n['template.loggedInAs']} #{sessionHandler.currentUser.nick}" />
......
code/LanBortalWeb/WebContent/map/create.xhtml
...@@ -15,6 +15,7 @@ ...@@ -15,6 +15,7 @@
<h:outputText value="#{i18n['map.name']}" /> <h:outputText value="#{i18n['map.name']}" />
<h:inputText value="#{mapManageView.mapname}" /> <h:inputText value="#{mapManageView.mapname}" />
<h:commandButton id="createrole" value="#{i18n['map.create']}" action="#{mapManageView.createMap}" /> <h:commandButton id="createrole" value="#{i18n['map.create']}" action="#{mapManageView.createMap}" />
<h:commandButton id="createTileMap" value="#{i18n['map.createTileMap']}" action="#{mapManageView.createTileMap}" />
</h:panelGrid> </h:panelGrid>
</h:form> </h:form>
......
code/LanBortalWeb/WebContent/resources/cditools/food/shop.xhtml
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core" xmlns:composite="http://java.sun.com/jsf/composite" <html xmlns="http://www.w3.org/1999/xhtml" xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core" xmlns:composite="http://java.sun.com/jsf/composite"
xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:tools="http://java.sun.com/jsf/composite/tools"> xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:tools="http://java.sun.com/jsf/composite/tools" xmlns:foodwave="http://java.sun.com/jsf/composite/cditools/foodwave">
<composite:interface> <composite:interface>
...@@ -20,61 +20,12 @@ ...@@ -20,61 +20,12 @@
</div> </div>
<h:dataTable styleClass="bordertable" id="billcart" value="#{cc.attrs.items}" var="cart"> <h:dataTable styleClass="bordertable" id="billcart" value="#{cc.attrs.items}" var="cart">
<h:column> <h:column>
<f:facet name="header"> <foodwave:list
<h:outputText id="name" value="${i18n['product.name']}" /> selectaction="#{foodWaveView.selectFoodView}"
</f:facet> items="#{foodWaveView.foodWaves}"
<h:outputText value="#{cart.product.name}" /> commitValue="#{i18n['food']}"
/>
</h:column> </h:column>
<h:column>
<f:facet name="header">
<h:outputText value="${i18n['product.price']}" />
</f:facet>
<h:outputText id="price" value="#{cart.product.price.abs()}">
<f:convertNumber maxFractionDigits="2" minFractionDigits="2" />
</h:outputText>
</h:column>
<h:column>
<f:facet name="header">
<h:outputText value="${i18n['product.totalPrice']}" />
</f:facet>
<h:outputText id="total" value="#{cart.price}">
<f:convertNumber maxFractionDigits="2" minFractionDigits="2" />
</h:outputText>
</h:column>
<h:column>
<f:facet name="header">
<h:outputText id="count" value="${i18n['product.cart.count']}" />
</f:facet>
<h:commandButton action="#{foodShopView.addMinusTen}" value="#{i18n['productshop.minusTen']}">
<f:ajax render="@form" />
</h:commandButton>
<h:commandButton action="#{foodShopView.addMinusOne}" value="#{i18n['productshop.minusOne']}">
<f:ajax render="@form" />
</h:commandButton>
<h:inputText size="4" id="cartcount" value="#{cart.count}">
<f:ajax render="@form" event="valueChange" />
</h:inputText>
<h:commandButton action="#{foodShopView.addOne}" value="#{i18n['productshop.plusOne']}">
<f:ajax render="@form" />
</h:commandButton>
<h:commandButton action="#{foodShopView.addTen}" value="#{i18n['productshop.plusTen']}">
<f:ajax render="@form" />
</h:commandButton>
</h:column>
<h:column>
<h:dataTable border="0" var="disc" value="#{cart.discounts}">
<h:column>
<h:outputText value="#{disc.shortdesc}" />
</h:column>
<h:column>
<h:outputText value="#{cart.getDiscount(disc.id)}">
<f:convertNumber maxFractionDigits="2" minFractionDigits="2" />
</h:outputText>
</h:column>
</h:dataTable>
</h:column>
</h:dataTable> </h:dataTable>
<div> <div>
<h:outputText value="#{i18n['productshop.total']} " /> <h:outputText value="#{i18n['productshop.total']} " />
......
code/LanBortalWeb/WebContent/resources/cditools/foodwave/list.xhtml 0 → 100644
<?xml version='1.0' encoding='UTF-8' ?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core" xmlns:composite="http://java.sun.com/jsf/composite"
xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:tools="http://java.sun.com/jsf/composite/tools">
<composite:interface>
<composite:attribute name="items" required="true" />
<!-- <composite:attribute name="selectValue" required="true" /> -->
<composite:attribute name="selectaction" method-signature="java.lang.String action()" required="true" />
</composite:interface>
<composite:implementation>
<!-- <h:outputScript target="head" library="script" name="jquery.min.js" /> -->
<!-- <h:outputScript target="head" library="script" name="shopscript.js" /> -->
<h:outputScript library="primefaces" name="jquery/jquery.js" />
<div style="margin-top: 5px;">
<h:commandButton action="#{cc.attrs.selectaction}" id="selectbutton-top" value="#{cc.attrs.selectValue}" />
</div>
<h:dataTable columnClasses="nowrap,numalign,numalign,nowrap,numalign" styleClass="bordertable" id="billcart" value="#{cc.attrs.items}" var="foodwave">
<h:column>
<f:facet name="header">
<h:outputText id="name" value="${i18n['foodWave.name']}" />
</f:facet>
<h:outputText value="#{foodwave.template.name}" />
</h:column>
<h:column >
<f:facet name="header">
<h:outputText value="${i18n['foodWave.description']}" />
</f:facet>
<h:outputText id="description" value="#{foodwave.template.description}" />
</h:column>
<h:commandButton action="#{cc.attrs.selectaction}" id="selectbutton-botton" value="#{cc.attrs.selectValue}" />
</h:dataTable>
</composite:implementation>
</html>
code/LanBortalWeb/WebContent/resources/cditools/user/list.xhtml
...@@ -40,7 +40,6 @@ ...@@ -40,7 +40,6 @@
<h:link value="#{i18n['user.firstNames']}" includeViewParams="true"> <h:link value="#{i18n['user.firstNames']}" includeViewParams="true">
<f:param name="sort" value="firstnames" /> <f:param name="sort" value="firstnames" />
<f:param name="page" value="0" /> <f:param name="page" value="0" />
</h:link> </h:link>
</f:facet> </f:facet>
<h:outputText value="#{user.firstnames}" /> <h:outputText value="#{user.firstnames}" />
......
code/LanBortalWeb/WebContent/resources/style/insomnia2/css/general.css
...@@ -15,4 +15,5 @@ display: none; ...@@ -15,4 +15,5 @@ display: none;
/* general class for hoverable usage */ /* general class for hoverable usage */
.hoverable { .hoverable {
} }
\ No newline at end of file
code/LanBortalWeb/WebContent/resources/style/template1/css/general.css
...@@ -16,4 +16,37 @@ height: 150px; ...@@ -16,4 +16,37 @@ height: 150px;
/* general class for hoverable usage */ /* general class for hoverable usage */
.hoverable { .hoverable {
} }
\ No newline at end of file
.hidden {
display: none;
}
#webcamcontainer {
}
#shopItems {}
.shopItem {
position: relative;
float:left;
width: 64px;
height: 64px;
background: gold;
border: 1px solid black;
margin: 2px;
}
.shopItem:hover {
background: goldenrod;
}
.shopItem a {
display: block;
width: 100%;
height: 100%;
color: black;
text-decoration: none;
}
code/LanBortalWeb/WebContent/resources/style/template1/css/style.css
...@@ -133,13 +133,14 @@ table tbody td { ...@@ -133,13 +133,14 @@ table tbody td {
border: none; border: none;
padding: 5px; padding: 5px;
padding-left: 1em; padding-left: 1em;
vertical-align: top;
} }
label { label {
} }
input { /* input {
border: 1px solid #ccc; border: 1px solid #ccc;
padding: 3px 6px; padding: 3px 6px;
border-radius: 6px; border-radius: 6px;
...@@ -165,3 +166,5 @@ border-radius: 8px; ...@@ -165,3 +166,5 @@ border-radius: 8px;
border: 1px solid black; border: 1px solid black;
background: lightblue; background: lightblue;
} }
*/
code/LanBortalWeb/WebContent/shop/shopToUser.xhtml
<!DOCTYPE html <!DOCTYPE html
PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
"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" <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:ui="http://java.sun.com/jsf/facelets" xmlns:products="http://java.sun.com/jsf/composite/cditools/products" xmlns:p="http://primefaces.org/ui" xmlns:users="http://java.sun.com/jsf/composite/cditools/user"
xmlns:h="http://java.sun.com/jsf/html"
xmlns:f="http://java.sun.com/jsf/core"
xmlns:products="http://java.sun.com/jsf/composite/cditools/products"
xmlns:p="http://primefaces.org/ui"
xmlns:users="http://java.sun.com/jsf/composite/cditools/user"
xmlns:c="http://java.sun.com/jsp/jstl/core"> xmlns:c="http://java.sun.com/jsp/jstl/core">
<h:body> <h:body>
<ui:composition <ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
template="/layout/#{sessionHandler.layout}/template.xhtml">
<f:metadata> <f:metadata>
<f:viewParam name="userid" value="#{userView.userid}" /> <f:viewParam name="userid" value="#{userView.userid}" />
<f:event type="preRenderView" listener="#{userView.initView}" /> <f:event type="preRenderView" listener="#{userView.initView}" />
<f:event type="preRenderView" <f:event type="preRenderView" listener="#{productShopView.initShopView}" />
listener="#{productShopView.initShopView}" />
</f:metadata> </f:metadata>
<ui:define name="title"> <ui:define name="title">
...@@ -27,7 +20,31 @@ ...@@ -27,7 +20,31 @@
<h:form id="shoppingcartform"> <h:form id="shoppingcartform">
<h:panelGrid columns="2"> <h:panelGrid columns="2">
<h:panelGrid columns="2">
<h:panelGroup>
<div id="shopItems">
<ui:repeat value="#{productShopView.shoppingcart}" var="cart">
<div class="shopItem">
<h:commandLink action="#{productShopView.addOne}" value="#{cart.product.name}">
<f:ajax render="@form" />
</h:commandLink>
</div>
</ui:repeat>
</div>
</h:panelGroup>
<h:panelGroup>
<h:dataGrid >
</h:dataGrid>
<h:outputLabel value="#{i18n['shop.readBarcode']}" />
<h:inputText id="barcode" value="#{productShopView.barcode}" />
<h:commandButton action="#{productShopView.readBarcode}" onclick="blip(); return true;" value="#{i18n['productShopView.readBarcode']}">
<f:ajax render="@form" onevent="barcodeReadEvent" execute="@form" />
</h:commandButton>
<h:outputLabel value="#{i18n['shop.accountBalance']}" /> <h:outputLabel value="#{i18n['shop.accountBalance']}" />
<h:outputText value="#{productShopView.accountBalance}"> <h:outputText value="#{productShopView.accountBalance}">
...@@ -44,29 +61,36 @@ ...@@ -44,29 +61,36 @@
<f:ajax render="@form" event="valueChange" /> <f:ajax render="@form" event="valueChange" />
<f:convertNumber /> <f:convertNumber />
</h:inputText> </h:inputText>
</h:panelGrid>
<h:panelGroup>
<h:outputLabel value="#{i18n['shop.readBarcode']}" />
<h:inputText id="barcode" value="#{productShopView.barcode}" />
<h:commandButton action="#{productShopView.readBarcode}"
onclick="blip(); return true;"
value="#{i18n['productShopView.readBarcode']}">
<f:ajax render="@form" onevent="barcodeReadEvent" execute="@form" />
</h:commandButton>
</h:panelGroup> </h:panelGroup>
</h:panelGrid> </h:panelGrid>
<h:outputText value="#{i18n['product.shopInstant']}" /> <h:outputText value="#{i18n['product.shopInstant']}" />
<h:selectBooleanCheckbox value="#{productShopView.payInstant}"> <h:selectBooleanCheckbox value="#{productShopView.payInstant}">
<f:ajax render="@form" execute="@form" /> <f:ajax render="@form" execute="@form" />
</h:selectBooleanCheckbox> </h:selectBooleanCheckbox>
<products:shop <h:outputScript library="primefaces" name="jquery/jquery.js" />
commitaction="#{productShopView.commitShoppingCart()}" <div style="margin-top: 5px;">
items="#{productShopView.shoppingcart}" <h:commandButton action="#{cc.attrs.commitaction}" id="commitbutton-top" value="#{cc.attrs.commitValue}" />
commitValue="#{i18n['productshop.commit']}" /> </div>
<div>
<h:outputText value="#{i18n['productshop.total']} " />
<h:outputText value="#{productShopView.totalPrice}">
<f:convertNumber maxFractionDigits="2" minFractionDigits="2" />
</h:outputText>
</div>
<h:commandButton action="#{cc.attrs.commitaction}" id="commitbutton-botton" value="#{cc.attrs.commitValue}" />
</h:form> </h:form>
<script> <script>
var blipSnd = new Audio( var blipSnd = new Audio(
...@@ -74,7 +98,8 @@ ...@@ -74,7 +98,8 @@
$(function() { $(function() {
$("#shoppingcartform\\:barcode").focus(); $("#shoppingcartform\\:barcode").focus();
})
});
function blip() { function blip() {
blipSnd.play(); blipSnd.play();
......
code/LanBortalWeb/src/fi/insomnia/bortal/servlet/BortalPasswordAuthenticator.java
...@@ -64,8 +64,6 @@ public class BortalPasswordAuthenticator implements PasswordAuthenticator { ...@@ -64,8 +64,6 @@ public class BortalPasswordAuthenticator implements PasswordAuthenticator {
} }
}); });
loginContext.login(); loginContext.login();
context.setLoginContext(loginContext);
// loginContext.logout(); // loginContext.logout();
return true; return true;
} catch (Exception e) { } catch (Exception e) {
......
code/LanBortalWeb/src/fi/insomnia/bortal/servlet/SshServlet.java
...@@ -6,7 +6,6 @@ import java.util.Map; ...@@ -6,7 +6,6 @@ import java.util.Map;
import java.util.Map.Entry; import java.util.Map.Entry;
import javax.ejb.EJB; import javax.ejb.EJB;
import javax.security.auth.login.LoginException;
import javax.servlet.Servlet; import javax.servlet.Servlet;
import javax.servlet.ServletConfig; import javax.servlet.ServletConfig;
import javax.servlet.ServletException; import javax.servlet.ServletException;
...@@ -36,13 +35,15 @@ public class SshServlet extends HttpServlet { ...@@ -36,13 +35,15 @@ public class SshServlet extends HttpServlet {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
private static final Logger logger = LoggerFactory.getLogger(SshServlet.class); private static final Logger logger = LoggerFactory.getLogger(SshServlet.class);
private Map<Integer, SshServer> servers = new HashMap<Integer, SshServer>(); private Map<Integer, SshServer> servers = new HashMap<Integer, SshServer>();
// Timeout 30 min // Timeout 30 min
private static final String TIMEOUT = new Integer(1000 * 60 * 30).toString(); private static final String TIMEOUT = new Integer(1000 * 60 * 30).toString();
@EJB @EJB
private EventBeanLocal eventbean; private EventBeanLocal eventbean;
@EJB private PermissionBeanLocal permBean; @EJB
private PermissionBeanLocal permBean;
/** /**
* @see HttpServlet#HttpServlet() * @see HttpServlet#HttpServlet()
...@@ -65,9 +66,9 @@ public class SshServlet extends HttpServlet { ...@@ -65,9 +66,9 @@ public class SshServlet extends HttpServlet {
logger.info("creating new bortal command"); logger.info("creating new bortal command");
BortalCommand bc = new BortalCommand(context); BortalCommand bc = new BortalCommand(context);
bc bc
.addCommandlineCommand("hello", new Hello(permBean)) .addCommandlineCommand("hello", new Hello(permBean))
.addCommandlineCommand("hallo", new Hello(permBean)); .addCommandlineCommand("hallo", new Hello(permBean));
return bc; return bc;
} }
} }
......
code/LanBortalWeb/src/fi/insomnia/bortal/servlet/UserCardServlet.java
...@@ -17,6 +17,14 @@ import javax.servlet.http.HttpServletResponse; ...@@ -17,6 +17,14 @@ import javax.servlet.http.HttpServletResponse;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import com.pdfjet.Box;
import com.pdfjet.CoreFont;
import com.pdfjet.Image;
import com.pdfjet.ImageType;
import com.pdfjet.PDF;
import com.pdfjet.Page;
import com.pdfjet.TextLine;
import fi.insomnia.bortal.beans.CardTemplateBeanLocal; import fi.insomnia.bortal.beans.CardTemplateBeanLocal;
import fi.insomnia.bortal.beans.PermissionBeanLocal; import fi.insomnia.bortal.beans.PermissionBeanLocal;
import fi.insomnia.bortal.beans.UserBeanLocal; import fi.insomnia.bortal.beans.UserBeanLocal;
...@@ -51,7 +59,8 @@ public class UserCardServlet extends GenericImageServlet { ...@@ -51,7 +59,8 @@ public class UserCardServlet extends GenericImageServlet {
@EJB @EJB
private transient CardTemplateBeanLocal cardbean; private transient CardTemplateBeanLocal cardbean;
private static final Logger logger = LoggerFactory.getLogger(UserCardServlet.class); private static final Logger logger = LoggerFactory
.getLogger(UserCardServlet.class);
@Override @Override
protected ImageMover getImagedata() { protected ImageMover getImagedata() {
...@@ -63,37 +72,40 @@ public class UserCardServlet extends GenericImageServlet { ...@@ -63,37 +72,40 @@ public class UserCardServlet extends GenericImageServlet {
if (card != null) { if (card != null) {
if (!permbean.isCurrentUser(card.getUser()) if (!permbean.isCurrentUser(card.getUser())
&& !permbean.hasPermission(UserPermission.MODIFY) && !permbean.hasPermission(UserPermission.MODIFY)
&& !lhMatcher.matcher(request.getLocalAddr()).matches()) && !lhMatcher.matcher(request.getLocalAddr()).matches()) {
{
ret.setResponse(HttpServletResponse.SC_FORBIDDEN); ret.setResponse(HttpServletResponse.SC_FORBIDDEN);
} } else {
else
{
try { try {
ret.setData(mkCard(card)); ret.setData(mkCard(card));
ret.setImagetype("image/jpeg"); // ret.setImagetype("image/jpeg");
ret.setImagetype("application/pdf");
} catch (IOException e) { } catch (IOException e) {
ret.setResponse(HttpServletResponse.SC_INTERNAL_SERVER_ERROR); ret.setResponse(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
} catch (Exception e) {
ret.setResponse(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
e.printStackTrace();
} }
} }
} else } else {
{
ret.setResponse(HttpServletResponse.SC_NOT_FOUND); ret.setResponse(HttpServletResponse.SC_NOT_FOUND);
} }
return ret; return ret;
} }
private byte[] mkCard(PrintedCard card) throws IOException { private byte[] mkCardJpeg(PrintedCard card) throws IOException {
EventUser user = card.getUser(); EventUser user = card.getUser();
BufferedImage face = ImageIO.read(new ByteArrayInputStream(user.getUser().getCurrentImage().getImageData())); BufferedImage face = ImageIO.read(new ByteArrayInputStream(user
.getUser().getCurrentImage().getImageData()));
BufferedImage base = ImageIO.read(new ByteArrayInputStream(card.getTemplate().getImage())); BufferedImage base = ImageIO.read(new ByteArrayInputStream(card
.getTemplate().getImage()));
BufferedImage outimage = new BufferedImage(base.getWidth(), base.getHeight(), BufferedImage.TYPE_INT_RGB); BufferedImage outimage = new BufferedImage(base.getWidth(),
base.getHeight(), BufferedImage.TYPE_INT_RGB);
Graphics2D g = outimage.createGraphics(); Graphics2D g = outimage.createGraphics();
// g.drawImage(org, AffineTransform.getScaleInstance(0.31, 0.31), null); // g.drawImage(org, AffineTransform.getScaleInstance(0.31, 0.31), null);
...@@ -113,7 +125,8 @@ public class UserCardServlet extends GenericImageServlet { ...@@ -113,7 +125,8 @@ public class UserCardServlet extends GenericImageServlet {
g.setFont(new Font("Century gothic", Font.BOLD, 45)); g.setFont(new Font("Century gothic", Font.BOLD, 45));
StringBuilder wholeName = new StringBuilder(); StringBuilder wholeName = new StringBuilder();
wholeName.append(user.getUser().getFirstnames()).append(" ").append(user.getUser().getLastname()); wholeName.append(user.getUser().getFirstnames()).append(" ")
.append(user.getUser().getLastname());
// g.setFont(new Font("Arial", Font.BOLD, 35)); // g.setFont(new Font("Arial", Font.BOLD, 35));
// g.drawString(name, 595 - // g.drawString(name, 595 -
...@@ -125,10 +138,13 @@ public class UserCardServlet extends GenericImageServlet { ...@@ -125,10 +138,13 @@ public class UserCardServlet extends GenericImageServlet {
g.drawString(wholeName.toString(), 60, 865); g.drawString(wholeName.toString(), 60, 865);
g.drawString(card.getTemplate().getName(), 60, 915); g.drawString(card.getTemplate().getName(), 60, 915);
String barcodeString = String.valueOf(user.getUser().getCreated().getTime().getTime()); String barcodeString = String.valueOf(user.getUser().getCreated()
.getTime().getTime());
barcodeString = barcodeString.substring(barcodeString.length() - 12); barcodeString = barcodeString.substring(barcodeString.length() - 12);
BufferedImage image = ImageIO.read(BarcodeUtils.getBarcodeEAN(barcodeString)); BufferedImage image = ImageIO.read(BarcodeUtils
g.drawImage(image, 0, base.getHeight() - 120, base.getWidth(), 120, null); .getBarcodeEAN(barcodeString));
g.drawImage(image, 0, base.getHeight() - 120, base.getWidth(), 120,
null);
g.dispose(); g.dispose();
...@@ -137,4 +153,102 @@ public class UserCardServlet extends GenericImageServlet { ...@@ -137,4 +153,102 @@ public class UserCardServlet extends GenericImageServlet {
ImageIO.write(outimage, "jpeg", ostr); ImageIO.write(outimage, "jpeg", ostr);
return ostr.toByteArray(); return ostr.toByteArray();
} }
// 300 dpi, 1016 px pituus, 648 px leveys,
// 85,5 mm x 54,0 mm
private byte[] mkCard(PrintedCard card) throws Exception {
EventUser user = card.getUser();
BufferedImage cardBackground = ImageIO.read(new ByteArrayInputStream(
card.getTemplate().getImage()));
BufferedImage faceBufferedImage = ImageIO
.read(new ByteArrayInputStream(user.getUser().getCurrentImage()
.getImageData()));
// double[] pageSize = new double[] { cardBackground.getWidth(),
// cardBackground.getHeight() };
ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
PDF pdf = new PDF(outputStream);
pdf.setTitle("CARD");
double pagex = 155.52; // 54,0 mm
double pagey = 243.84; // 85,5 mm
Page page = new Page(pdf, new double[] { pagex, pagey });
// Render background image
Image templateImage = new Image(pdf,
convertBufferedImageToPng(cardBackground), ImageType.PNG);
templateImage.setPosition(0, 0);
templateImage.scaleBy(0.245);
templateImage.drawOn(page);
// Render face image
Image faceImage = new Image(pdf,
convertBufferedImageToPng(faceBufferedImage), ImageType.PNG);
faceImage.setPosition(15.5, 70.0);
faceImage.scaleBy(0.32);
faceImage.drawOn(page);
// Render texts
// Big font for nick
com.pdfjet.Font nickFont = new com.pdfjet.Font(pdf, CoreFont.HELVETICA);
nickFont.setSize(16.0);
// User nick text
TextLine nickTextLine = new TextLine(nickFont);
nickTextLine.setText(user.getUser().getNick());
nickTextLine.setPosition(19.0, 193.0);
nickTextLine.setColor(new double[] {1.0, 1.0, 1.0});
nickTextLine.drawOn(page);
// Smaller font
com.pdfjet.Font font = new com.pdfjet.Font(pdf, CoreFont.HELVETICA);
font.setSize(10.0);
// Full name text
String wholeName = user.getUser().getFirstnames() + " "
+ user.getUser().getLastname();
TextLine wholeNameText = new TextLine(font);
wholeNameText.setText(wholeName);
wholeNameText.setPosition(17.0, 212.0);
wholeNameText.setColor(new double[] {1.0, 1.0, 1.0});
wholeNameText.drawOn(page);
// Role text
TextLine roleTextLine = new TextLine(font);
roleTextLine.setText(card.getTemplate().getName());
roleTextLine.setPosition(17.0, 223.0);
roleTextLine.setColor(new double[] {1.0, 1.0, 1.0});
roleTextLine.drawOn(page);
// Barcode
String barcodeString = String.valueOf(user.getUser().getCreated()
.getTime().getTime());
barcodeString = barcodeString.substring(barcodeString.length() - 12);
BufferedImage barCodeBufferedImage = ImageIO.read(BarcodeUtils
.getBarcodeEAN(barcodeString));
Image barCodeImage = new Image(pdf,
convertBufferedImageToPng(barCodeBufferedImage), ImageType.PNG);
barCodeImage.setPosition(0.0, 243.5);
barCodeImage.scaleBy(0.7);
barCodeImage.drawOn(page);
// Write out the pdf
pdf.flush();
outputStream.close();
return outputStream.toByteArray();
}
private ByteArrayInputStream convertBufferedImageToPng(BufferedImage img)
throws IOException {
ByteArrayOutputStream outStream = new ByteArrayOutputStream();
ImageIO.write(img, "png", outStream);
outStream.close();
return new ByteArrayInputStream(outStream.toByteArray());
}
} }
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!