rikoin ui:n, toisin tuon default, insomnia ui ok.

code/LanBortalDatabase/src/fi/insomnia/bortal/model/AccountEvent_.java

-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-06T13:36:54.827+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;
-}
+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-06T14:32:34.709+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

-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-06T13:36:54.843+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;
-}
+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-06T14:32:34.771+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

-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-06T13:36:54.836+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;
-}
+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-06T14:32:34.752+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

-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-06T13:36:54.849+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;
-}
+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-06T14:32:34.785+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

-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-06T13:36:54.862+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;
-}
+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-06T14:32:34.831+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

-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-06T13:36:54.855+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;
-}
+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-06T14:32:34.803+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

-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-06T13:36:54.868+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;
-}
+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-06T14:32:34.842+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

-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-06T13:36:54.892+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;
-}
+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-06T14:32:34.916+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

-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-06T13:36:54.899+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;
-}
+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-06T14:32:34.933+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

-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-06T13:36:54.883+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;
-}
+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-06T14:32:34.896+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

-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-06T13:36:54.874+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;
-}
+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-06T14:32:34.873+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

-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-06T13:36:54.914+0300")
-@StaticMetamodel(DiscountInstance.class)
-public class DiscountInstance_ extends GenericEntity_ {
-	public static volatile SingularAttribute<DiscountInstance, AccountEvent> accountEvent;
-	public static volatile SingularAttribute<DiscountInstance, Discount> discount;
-}
+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-06T14:32:34.966+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

-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-06T13:36:54.906+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;
-}
+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-06T14:32:34.950+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

-package fi.insomnia.bortal.model;
-
-import javax.annotation.Generated;
-import javax.persistence.metamodel.StaticMetamodel;
-
-@Generated(value="Dali", date="2012-10-06T13:36:54.921+0300")
-@StaticMetamodel(EntityEquals.class)
-public class EntityEquals_ {
-}
+package fi.insomnia.bortal.model;
+
+import javax.annotation.Generated;
+import javax.persistence.metamodel.StaticMetamodel;
+
+@Generated(value="Dali", date="2012-10-06T14:32:34.985+0300")
+@StaticMetamodel(EntityEquals.class)
+public class EntityEquals_ {
+}

code/LanBortalDatabase/src/fi/insomnia/bortal/model/EventMap_.java

-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-06T13:36:54.927+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;
-}
+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-06T14:32:35.002+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

-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-06T13:36:54.934+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;
-}
+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-06T14:32:35.013+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

-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-06T13:36:54.940+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;
-}
+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-06T14:32:35.034+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

-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-06T13:36:54.953+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;
-}
+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-06T14:32:35.056+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

-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-06T13:36:54.947+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;
-}
+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-06T14:32:35.046+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

-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-06T13:36:54.959+0300")
-@StaticMetamodel(GenericEntity.class)
-public class GenericEntity_ extends EntityEquals_ {
-	public static volatile SingularAttribute<GenericEntity, Integer> id;
-}
+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-06T14:32:35.065+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

-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-06T13:36:54.966+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;
-}
+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-06T14:32:35.078+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

-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-06T13:36:54.979+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;
-}
+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-06T14:32:35.115+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

-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-06T13:36:54.985+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;
-}
+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-06T14:32:15.127+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

-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-06T13:36:55.005+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;
-}
+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-06T14:32:35.127+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

-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-06T13:36:54.973+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;
-}
+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-06T14:32:35.088+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

-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-06T13:36:55.011+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;
-}
+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-06T14:32:35.138+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

-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-06T13:36:55.025+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;
-}
+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-06T14:32:35.159+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

-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-06T13:36:55.018+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;
-}
+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-06T14:32:35.154+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

-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-06T13:36:55.038+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;
-}
+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-06T14:32:35.179+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

-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-06T13:36:55.031+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;
-}
+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-06T14:32:35.174+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

-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-06T13:36:55.052+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;
-}
+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-06T14:32:35.198+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

-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-06T13:36:55.045+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;
-}
+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-06T14:32:35.193+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

-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-06T13:36:55.059+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;
-}
+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-06T14:32:35.209+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

-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-06T13:36:55.066+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;
-}
+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-06T14:32:35.220+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

-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-06T13:36:55.093+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;
-}
+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-06T14:32:35.246+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

-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-06T13:36:55.075+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;
-}
+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-06T14:32:35.232+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

-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-06T13:36:55.110+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;
-}
+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-06T14:32:35.270+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

-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-06T13:36:55.118+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;
-}
+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-06T14:32:35.275+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

-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-06T13:36:55.102+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;
-}
+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-06T14:32:35.259+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

-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-06T13:36:55.126+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;
-}
+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-06T14:32:35.292+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

-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-06T13:36:55.134+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;
-}
+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-06T14:32:35.300+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

-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-06T13:36:55.148+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;
-}
+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-06T14:32:35.323+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

-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-06T13:36:55.141+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;
-}
+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-06T14:32:35.312+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

-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-06T13:36:55.162+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;
-}
+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-06T14:32:35.350+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

-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-06T13:36:55.155+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;
-}
+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-06T14:32:35.338+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

-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-06T13:36:55.170+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;
-}
+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-06T14:32:35.359+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

-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-06T13:36:55.192+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;
-}
+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-06T14:32:35.400+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

-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-06T13:36:55.209+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;
-}
+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-06T14:32:35.422+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

-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-06T13:36:55.216+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;
-}
+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-06T14:32:35.435+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

-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-06T13:36:55.201+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;
-}
+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-06T14:32:35.412+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

-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-06T13:36:55.223+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;
-}
+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-06T14:32:35.446+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

-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-06T13:36:55.176+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;
-}
+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-06T14:32:35.370+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

-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-06T13:36:55.186+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;
-}
+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-06T14:32:35.384+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 @@
 
 
 	<h:body>
 	<h:body>
 		<div id="page-container">
 		<div id="page-container">
-	
-		<div id="page-header">
-			<div id="logo">
+		<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 @@
 									<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 @@
 					<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/user/edit.xhtml

 <?xml version='1.0' encoding='UTF-8' ?>
 <?xml version='1.0' encoding='UTF-8' ?>
 <!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" 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:p="http://primefaces.org/ui">
+<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:p="http://primefaces.org/ui">
 
 
 
 
 <composite:interface>
 <composite:interface>
@@ -15,110 +14,124 @@
 </composite:interface>
 </composite:interface>
 
 
 <composite:implementation>
 <composite:implementation>
+	<h:outputScript library="primefaces" name="jquery/jquery.js" target="head" />
+
+	<h2>
+		<h:outputText rendered="#{!cc.attrs.creating}" disabled="#{!cc.attrs.creating and !userView.canSave}" id="viewlogin" value="#{userView.selectedUser.login}" />
+	</h2>
+	<h:message rendered="#{!cc.attrs.creating}" for="viewlogin" />
+	<h:message rendered="#{sessionHandler.superadmin}" for="superadmin" />
+	<h:form id="userform" enctype="multipart/form-data" styleClass="ui-widget">
+		<h:panelGrid columns="2">
+
+			<h:panelGroup >
+
+				<ui:fragment rendered="#{not empty userView.user.id}">
+					<div id="webcamcontainer" style="display: none;">
+						<p:photoCam widgetVar="pc" listener="#{userView.oncapture}" update="@all" />
+						<p:commandButton type="button" value="Capture" onclick="pc.capture()" />
+					</div>
+
+					<h:outputText rendered="#{empty userView.user.currentImage}" value="#{i18n['user.noCurrentImage']}" />
+					<ui:fragment rendered="#{!empty userView.user.currentImage}">
+						<img style="width: 150px;" src="#{request.contextPath}/dydata/userimage/#{userView.user.currentImage.id}.img" alt="image" />
+					</ui:fragment>
+					<br />
+					<button onclick="$('#webcamcontainer').show();$(this).hide();return false;">#{i18n['userimage.webcam']}</button>
+					<br />
+					<br />
+
+					<p:fileUpload id="uploadfile" required="TRUE" requiredMessage="Required!" invalidSizeMessage="#{i18n['user.imageTooBig']}" sizeLimit="1024" value="#{userView.image}" mode="simple" />
+					<h:message for="uploadfile" />
+					<h:commandButton styleClass="ui-button" action="#{userView.sendImage}" value="#{i18n['user.imagesubmit']}" />
+				</ui:fragment>
+
+				<ui:fragment rendered="#{cc.attrs.creating}">
+					<h:outputLabel value="#{i18n['user.login']}:" for="login" />
+					<br />
+					<h:inputText styleClass="ui-input" size="25" id="login" disabled="#{!cc.attrs.creating and !userView.canSave}" value="#{userView.selectedUser.login}" />
+					<h:message for="login" />
+					<br />
+
+				</ui:fragment>
+				<br />
+
+				<h:outputLabel value="#{i18n['user.email']}:" for="email" />
+				<br />
+				<h:inputText styleClass="ui-input" validator="#{userValidator.validateEmail}" size="45" id="email" disabled="#{!cc.attrs.creating and !userView.canSave}" value="#{userView.selectedUser.email}" />
+				<h:message for="email" />
+				<br />
+
+				<h:outputLabel rendered="#{cc.attrs.creating}" value="#{i18n['user.password']}:" for="password" />
+				<br />
+				<h:inputSecret styleClass="ui-input" validator="#{userValidator.password}" rendered="#{cc.attrs.creating}" id="password" value="#{userView.password}" />
+				<h:message rendered="#{cc.attrs.creating}" for="password" />
+				<br />
+				<h:outputLabel rendered="#{cc.attrs.creating}" value="#{i18n['user.passwordcheck']}:" for="passwordcheck" />
+				<br />
+				<h:inputSecret styleClass="ui-input" validator="#{userValidator.password}" rendered="#{cc.attrs.creating}" id="passwordcheck" value="#{userView.passwordcheck}" />
+				<h:message rendered="#{cc.attrs.creating}" for="passwordcheck" />
+				<br />
+
+			</h:panelGroup>
+
+
+			<h:panelGroup>
+				<table>
+					<tr>
+						<td colspan="2"><h:outputLabel value="#{i18n['user.nick']}:" for="nick" /> <br /> <h:inputText size="45" id="nick" disabled="#{!cc.attrs.creating and !userView.canSave}"
+								value="#{userView.selectedUser.nick}" /><br /> <h:message for="nick" /></td>
+					</tr>
+					<tr>
+						<td><h:outputLabel value="#{i18n['user.firstNames']}:" for="firstnames" /></td>
+						<td><h:outputLabel value="#{i18n['user.lastName']}:" for="lastname" /></td>
+					</tr>
+					<tr>
+						<td><h:inputText styleClass="ui-input" size="22" id="firstnames" disabled="#{!cc.attrs.creating and !userView.canSave}" value="#{userView.selectedUser.firstnames}" /></td>
+						<td><h:inputText styleClass="ui-input" size="30" id="lastname" disabled="#{!cc.attrs.creating and !userView.canSave}" value="#{userView.selectedUser.lastname}" /></td>
+					</tr>
+					<tr>
+						<td><h:message for="firstnames" /></td>
+						<td><h:message for="lastname" /></td>
+					</tr>
+					<tr>
+						<td><h:outputLabel for="birthday" value="#{i18n['user.birthday']}:" /><br /> <p:calendar id="birthday" navigator="true" yearRange="c-80:c-0" locale="fi"
+								value="#{userView.selectedUser.birthday}" pattern="#{sessionHandler.dateFormat}" timeZone="#{sessionHandler.timezone}" /> <h:message for="birthday" /></td>
+						<td><h:outputLabel value="#{i18n['user.sex']}:" for="sex" /> <br /> <h:selectOneMenu disabled="#{!cc.attrs.creating and !userView.canSave}" id="sex"
+								value="#{userView.selectedUser.gender}">
+								<f:selectItem id="undefined" itemLabel="#{i18n['user.sex.UNDEFINED']}" itemValue="UNDEFINED" />
+								<f:selectItem id="male" itemLabel="#{i18n['user.sex.MALE']}" itemValue="MALE" />
+								<f:selectItem id="female" itemLabel="#{i18n['user.sex.FEMALE']}" itemValue="FEMALE" />
+							</h:selectOneMenu> <h:message for="sex" /></td>
+					</tr>
+				</table>
+
+				<table>
+					<tr>
+						<td colspan="2"><h:outputLabel value="#{i18n['user.address']}:" for="address" /><br /> <h:inputText styleClass="ui-input" size="45" id="address" disabled="#{!cc.attrs.creating and !userView.canSave}"
+								value="#{userView.selectedUser.address}" /> <h:message for="address" /></td>
+					</tr>
+					<tr>
+						<td><h:outputLabel value="#{i18n['user.zipCode']}:" for="zip" /><br /> <h:inputText styleClass="ui-input" size="7" id="zip" disabled="#{!cc.attrs.creating and !userView.canSave}"
+								value="#{userView.selectedUser.zip}" /> <h:message for="zip" /></td>
+						<td><h:outputLabel value="#{i18n['user.town']}:" for="town" /><br /> <h:inputText styleClass="ui-input" size="25" id="town" disabled="#{!cc.attrs.creating and !userView.canSave}"
+								value="#{userView.selectedUser.town}" /> <h:message for="town" /></td>
+					</tr>
+
+
+				</table>
+				<h:outputLabel rendered="#{sessionHandler.superadmin}" value="#{i18n['user.superadmin']}:" for="superadmin" />
+				<h:selectBooleanCheckbox disabled="#{!cc.attrs.creating and !userView.canSave}" rendered="#{sessionHandler.superadmin}" id="superadmin" value="#{userView.selectedUser.superadmin}" />
+				<br />
+				<br />
+				<h:commandButton styleClass="ui-button" rendered="#{cc.attrs.creating or userView.canSave}" id="commitbtn" action="#{cc.attrs.commitaction}" value="#{cc.attrs.commitvalue}" />
+
+			</h:panelGroup>
 
 
-
-	<h:form id="userform">
-		<h:panelGrid columns="3">
-
-			<h:outputLabel rendered="#{!cc.attrs.creating}" value="#{i18n['user.login']}:" for="viewlogin" />
-			<h:outputText rendered="#{!cc.attrs.creating}" disabled="#{!cc.attrs.creating and !userView.canSave}"
-				id="viewlogin" value="#{userView.selectedUser.login}"
-			/>
-			<h:message rendered="#{!cc.attrs.creating}" for="viewlogin" />
-
-			<h:outputLabel rendered="#{cc.attrs.creating}" value="#{i18n['user.login']}:" for="login" />
-			<h:inputText size="45"  rendered="#{cc.attrs.creating}" validator="#{userValidator.login}"
-				disabled="#{!cc.attrs.creating and !userView.canSave}" id="login" value="#{userView.selectedUser.login}"
-			/>
-			<h:message rendered="#{cc.attrs.creating}" for="login" />
-
-			<h:outputLabel value="#{i18n['user.nick']}:" for="nick" />
-			<h:inputText size="45"  id="nick" disabled="#{!cc.attrs.creating and !userView.canSave}" value="#{userView.selectedUser.nick}" />
-			<h:message for="nick" />
-
-
-			<h:outputLabel value="#{i18n['user.email']}:" for="email" />
-			<h:inputText validator="#{userValidator.validateEmail}" size="45"  id="email" disabled="#{!cc.attrs.creating and !userView.canSave}"
-				value="#{userView.selectedUser.email}"
-			/>
-			<h:message for="email" />
-
-			<h:outputLabel value="#{i18n['user.firstNames']}:" for="firstnames" />
-			<h:inputText size="45"  id="firstnames" disabled="#{!cc.attrs.creating and !userView.canSave}"
-				value="#{userView.selectedUser.firstnames}"
-			/>
-			<h:message for="firstnames" />
-
-			<h:outputLabel value="#{i18n['user.lastName']}:" for="lastname" />
-			<h:inputText size="45"  id="lastname" disabled="#{!cc.attrs.creating and !userView.canSave}"
-				value="#{userView.selectedUser.lastname}"
-			/>
-			<h:message for="lastname" />
-
-			<h:outputLabel value="#{i18n['user.address']}:" for="address" />
-			<h:inputText size="45"  id="address" disabled="#{!cc.attrs.creating and !userView.canSave}"
-				value="#{userView.selectedUser.address}"
-			/>
-			<h:message for="address" />
-
-			<h:outputLabel value="#{i18n['user.zipCode']}:" for="zip" />
-			<h:inputText size="45"  id="zip" disabled="#{!cc.attrs.creating and !userView.canSave}" value="#{userView.selectedUser.zip}" />
-			<h:message for="zip" />
-
-			<h:outputLabel value="#{i18n['user.town']}:" for="town" />
-			<h:inputText size="45" id="town" disabled="#{!cc.attrs.creating and !userView.canSave}" value="#{userView.selectedUser.town}" />
-			<h:message for="town" />
-
-
-			
-			<!--
-                <h:outputLabel  value="#{i18n['user.defaultImage']}:" for="currentImage" />
-                	<h:selectOneMenu rendered="#{sessionHandler.hasPermission('USER', 'READ')}" id="currentImage" value="#{userView.selectedUser.currentImage}" converter="#{userimageConverter}" >
-					<f:selectItems var="image" itemLabel="#{image.description}" value="#{userView.selectedUser.userImageList}" />
-               	</h:selectOneMenu>
-				 -->
-			<h:outputLabel value="#{i18n['user.sex']}:" for="sex" />
-			<h:selectOneRadio disabled="#{!cc.attrs.creating and !userView.canSave}" id="sex"
-				value="#{userView.selectedUser.gender}"
-			>
-				<f:selectItem id="undefined" itemLabel="#{i18n['user.sex.UNDEFINED']}" itemValue="UNDEFINED" />
-				<f:selectItem id="male" itemLabel="#{i18n['user.sex.MALE']}" itemValue="MALE" />
-				<f:selectItem id="female" itemLabel="#{i18n['user.sex.FEMALE']}" itemValue="FEMALE" />
-			</h:selectOneRadio>
-			<h:message for="sex" />
-			
-			<h:outputLabel for="birthday" value="#{i18n['user.birthday']}:"/>
-			<p:calendar id="birthday" navigator="true" yearRange="c-80:c-0" locale="fi" value="#{userView.selectedUser.birthday}" pattern="#{sessionHandler.dateFormat}" timeZone="#{sessionHandler.timezone}" />
-			<h:message for="birthday" />
-
-
-
-			<h:outputLabel rendered="#{cc.attrs.creating}" value="#{i18n['user.password']}:" for="password" />
-			<h:inputSecret validator="#{userValidator.password}" rendered="#{cc.attrs.creating}" id="password"
-				value="#{userView.password}"
-			/>
-			<h:message rendered="#{cc.attrs.creating}" for="password" />
-
-			<h:outputLabel rendered="#{cc.attrs.creating}" value="#{i18n['user.passwordcheck']}:" for="passwordcheck" />
-			<h:inputSecret validator="#{userValidator.password}" rendered="#{cc.attrs.creating}" id="passwordcheck"
-				value="#{userView.passwordcheck}"
-			/>
-			<h:message rendered="#{cc.attrs.creating}" for="passwordcheck" />
-			
-			<h:outputLabel rendered="#{sessionHandler.superadmin}" value="#{i18n['user.superadmin']}:" for="superadmin" />
-			<h:selectBooleanCheckbox disabled="#{!cc.attrs.creating and !userView.canSave}"
-				rendered="#{sessionHandler.superadmin}" id="superadmin" value="#{userView.selectedUser.superadmin}"
-			/>
-			<h:message rendered="#{sessionHandler.superadmin}" for="superadmin" />
-			
-			
-			
-			<h:commandButton rendered="#{cc.attrs.creating or userView.canSave}" id="commitbtn"
-				action="#{cc.attrs.commitaction}" value="#{cc.attrs.commitvalue}"
-			/>
 		</h:panelGrid>
 		</h:panelGrid>
 	</h:form>
 	</h:form>
 
 
+
 </composite:implementation>
 </composite:implementation>
 </html>
 </html>
 
 

code/LanBortalWeb/WebContent/resources/cditools/user/list.xhtml

@@ -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;
 /*  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;
 /*  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/jquery-ui-1.8.24.custom.css

+/*!
+ * jQuery UI CSS Framework 1.8.24
+ *
+ * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Theming/API
+ */
+
+/* Layout helpers
+----------------------------------*/
+.ui-helper-hidden { display: none; }
+.ui-helper-hidden-accessible { position: absolute !important; clip: rect(1px 1px 1px 1px); clip: rect(1px,1px,1px,1px); }
+.ui-helper-reset { margin: 0; padding: 0; border: 0; outline: 0; line-height: 1.3; text-decoration: none; font-size: 100%; list-style: none; }
+.ui-helper-clearfix:before, .ui-helper-clearfix:after { content: ""; display: table; }
+.ui-helper-clearfix:after { clear: both; }
+.ui-helper-clearfix { zoom: 1; }
+.ui-helper-zfix { width: 100%; height: 100%; top: 0; left: 0; position: absolute; opacity: 0; filter:Alpha(Opacity=0); }
+
+
+/* Interaction Cues
+----------------------------------*/
+.ui-state-disabled { cursor: default !important; }
+
+
+/* Icons
+----------------------------------*/
+
+/* states and images */
+.ui-icon { display: block; text-indent: -99999px; overflow: hidden; background-repeat: no-repeat; }
+
+
+/* Misc visuals
+----------------------------------*/
+
+/* Overlays */
+.ui-widget-overlay { position: absolute; top: 0; left: 0; width: 100%; height: 100%; }
+
+
+/*!
+ * jQuery UI CSS Framework 1.8.24
+ *
+ * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Theming/API
+ *
+ * To view and modify this theme, visit http://jqueryui.com/themeroller/?ffDefault=Verdana,Arial,sans-serif&fwDefault=normal&fsDefault=1.1em&cornerRadius=4px&bgColorHeader=cccccc&bgTextureHeader=03_highlight_soft.png&bgImgOpacityHeader=75&borderColorHeader=aaaaaa&fcHeader=222222&iconColorHeader=222222&bgColorContent=ffffff&bgTextureContent=01_flat.png&bgImgOpacityContent=75&borderColorContent=aaaaaa&fcContent=222222&iconColorContent=222222&bgColorDefault=e6e6e6&bgTextureDefault=02_glass.png&bgImgOpacityDefault=75&borderColorDefault=d3d3d3&fcDefault=555555&iconColorDefault=888888&bgColorHover=dadada&bgTextureHover=02_glass.png&bgImgOpacityHover=75&borderColorHover=999999&fcHover=212121&iconColorHover=454545&bgColorActive=ffffff&bgTextureActive=02_glass.png&bgImgOpacityActive=65&borderColorActive=aaaaaa&fcActive=212121&iconColorActive=454545&bgColorHighlight=fbf9ee&bgTextureHighlight=02_glass.png&bgImgOpacityHighlight=55&borderColorHighlight=fcefa1&fcHighlight=363636&iconColorHighlight=2e83ff&bgColorError=fef1ec&bgTextureError=02_glass.png&bgImgOpacityError=95&borderColorError=cd0a0a&fcError=cd0a0a&iconColorError=cd0a0a&bgColorOverlay=aaaaaa&bgTextureOverlay=01_flat.png&bgImgOpacityOverlay=0&opacityOverlay=30&bgColorShadow=aaaaaa&bgTextureShadow=01_flat.png&bgImgOpacityShadow=0&opacityShadow=30&thicknessShadow=8px&offsetTopShadow=-8px&offsetLeftShadow=-8px&cornerRadiusShadow=8px
+ */
+
+
+/* Component containers
+----------------------------------*/
+.ui-widget { font-family: Verdana,Arial,sans-serif; font-size: 1.1em; }
+.ui-widget .ui-widget { font-size: 1em; }
+.ui-widget input, .ui-widget select, .ui-widget textarea, .ui-widget button { font-family: Verdana,Arial,sans-serif; font-size: 1em; }
+.ui-widget-content { border: 1px solid #aaaaaa; background: #ffffff url(images/ui-bg_flat_75_ffffff_40x100.png) 50% 50% repeat-x; color: #222222; }
+.ui-widget-content a { color: #222222; }
+.ui-widget-header { border: 1px solid #aaaaaa; background: #cccccc url(images/ui-bg_highlight-soft_75_cccccc_1x100.png) 50% 50% repeat-x; color: #222222; font-weight: bold; }
+.ui-widget-header a { color: #222222; }
+
+/* Interaction states
+----------------------------------*/
+.ui-state-default, .ui-widget-content .ui-state-default, .ui-widget-header .ui-state-default { border: 1px solid #d3d3d3; background: #e6e6e6 url(images/ui-bg_glass_75_e6e6e6_1x400.png) 50% 50% repeat-x; font-weight: normal; color: #555555; }
+.ui-state-default a, .ui-state-default a:link, .ui-state-default a:visited { color: #555555; text-decoration: none; }
+.ui-state-hover, .ui-widget-content .ui-state-hover, .ui-widget-header .ui-state-hover, .ui-state-focus, .ui-widget-content .ui-state-focus, .ui-widget-header .ui-state-focus { border: 1px solid #999999; background: #dadada url(images/ui-bg_glass_75_dadada_1x400.png) 50% 50% repeat-x; font-weight: normal; color: #212121; }
+.ui-state-hover a, .ui-state-hover a:hover { color: #212121; text-decoration: none; }
+.ui-state-active, .ui-widget-content .ui-state-active, .ui-widget-header .ui-state-active { border: 1px solid #aaaaaa; background: #ffffff url(images/ui-bg_glass_65_ffffff_1x400.png) 50% 50% repeat-x; font-weight: normal; color: #212121; }
+.ui-state-active a, .ui-state-active a:link, .ui-state-active a:visited { color: #212121; text-decoration: none; }
+.ui-widget :active { outline: none; }
+
+/* Interaction Cues
+----------------------------------*/
+.ui-state-highlight, .ui-widget-content .ui-state-highlight, .ui-widget-header .ui-state-highlight  {border: 1px solid #fcefa1; background: #fbf9ee url(images/ui-bg_glass_55_fbf9ee_1x400.png) 50% 50% repeat-x; color: #363636; }
+.ui-state-highlight a, .ui-widget-content .ui-state-highlight a,.ui-widget-header .ui-state-highlight a { color: #363636; }
+.ui-state-error, .ui-widget-content .ui-state-error, .ui-widget-header .ui-state-error {border: 1px solid #cd0a0a; background: #fef1ec url(images/ui-bg_glass_95_fef1ec_1x400.png) 50% 50% repeat-x; color: #cd0a0a; }
+.ui-state-error a, .ui-widget-content .ui-state-error a, .ui-widget-header .ui-state-error a { color: #cd0a0a; }
+.ui-state-error-text, .ui-widget-content .ui-state-error-text, .ui-widget-header .ui-state-error-text { color: #cd0a0a; }
+.ui-priority-primary, .ui-widget-content .ui-priority-primary, .ui-widget-header .ui-priority-primary { font-weight: bold; }
+.ui-priority-secondary, .ui-widget-content .ui-priority-secondary,  .ui-widget-header .ui-priority-secondary { opacity: .7; filter:Alpha(Opacity=70); font-weight: normal; }
+.ui-state-disabled, .ui-widget-content .ui-state-disabled, .ui-widget-header .ui-state-disabled { opacity: .35; filter:Alpha(Opacity=35); background-image: none; }
+
+/* Icons
+----------------------------------*/
+
+/* states and images */
+.ui-icon { width: 16px; height: 16px; background-image: url(images/ui-icons_222222_256x240.png); }
+.ui-widget-content .ui-icon {background-image: url(images/ui-icons_222222_256x240.png); }
+.ui-widget-header .ui-icon {background-image: url(images/ui-icons_222222_256x240.png); }
+.ui-state-default .ui-icon { background-image: url(images/ui-icons_888888_256x240.png); }
+.ui-state-hover .ui-icon, .ui-state-focus .ui-icon {background-image: url(images/ui-icons_454545_256x240.png); }
+.ui-state-active .ui-icon {background-image: url(images/ui-icons_454545_256x240.png); }
+.ui-state-highlight .ui-icon {background-image: url(images/ui-icons_2e83ff_256x240.png); }
+.ui-state-error .ui-icon, .ui-state-error-text .ui-icon {background-image: url(images/ui-icons_cd0a0a_256x240.png); }
+
+/* positioning */
+.ui-icon-carat-1-n { background-position: 0 0; }
+.ui-icon-carat-1-ne { background-position: -16px 0; }
+.ui-icon-carat-1-e { background-position: -32px 0; }
+.ui-icon-carat-1-se { background-position: -48px 0; }
+.ui-icon-carat-1-s { background-position: -64px 0; }
+.ui-icon-carat-1-sw { background-position: -80px 0; }
+.ui-icon-carat-1-w { background-position: -96px 0; }
+.ui-icon-carat-1-nw { background-position: -112px 0; }
+.ui-icon-carat-2-n-s { background-position: -128px 0; }
+.ui-icon-carat-2-e-w { background-position: -144px 0; }
+.ui-icon-triangle-1-n { background-position: 0 -16px; }
+.ui-icon-triangle-1-ne { background-position: -16px -16px; }
+.ui-icon-triangle-1-e { background-position: -32px -16px; }
+.ui-icon-triangle-1-se { background-position: -48px -16px; }
+.ui-icon-triangle-1-s { background-position: -64px -16px; }
+.ui-icon-triangle-1-sw { background-position: -80px -16px; }
+.ui-icon-triangle-1-w { background-position: -96px -16px; }
+.ui-icon-triangle-1-nw { background-position: -112px -16px; }
+.ui-icon-triangle-2-n-s { background-position: -128px -16px; }
+.ui-icon-triangle-2-e-w { background-position: -144px -16px; }
+.ui-icon-arrow-1-n { background-position: 0 -32px; }
+.ui-icon-arrow-1-ne { background-position: -16px -32px; }
+.ui-icon-arrow-1-e { background-position: -32px -32px; }
+.ui-icon-arrow-1-se { background-position: -48px -32px; }
+.ui-icon-arrow-1-s { background-position: -64px -32px; }
+.ui-icon-arrow-1-sw { background-position: -80px -32px; }
+.ui-icon-arrow-1-w { background-position: -96px -32px; }
+.ui-icon-arrow-1-nw { background-position: -112px -32px; }
+.ui-icon-arrow-2-n-s { background-position: -128px -32px; }
+.ui-icon-arrow-2-ne-sw { background-position: -144px -32px; }
+.ui-icon-arrow-2-e-w { background-position: -160px -32px; }
+.ui-icon-arrow-2-se-nw { background-position: -176px -32px; }
+.ui-icon-arrowstop-1-n { background-position: -192px -32px; }
+.ui-icon-arrowstop-1-e { background-position: -208px -32px; }
+.ui-icon-arrowstop-1-s { background-position: -224px -32px; }
+.ui-icon-arrowstop-1-w { background-position: -240px -32px; }
+.ui-icon-arrowthick-1-n { background-position: 0 -48px; }
+.ui-icon-arrowthick-1-ne { background-position: -16px -48px; }
+.ui-icon-arrowthick-1-e { background-position: -32px -48px; }
+.ui-icon-arrowthick-1-se { background-position: -48px -48px; }
+.ui-icon-arrowthick-1-s { background-position: -64px -48px; }
+.ui-icon-arrowthick-1-sw { background-position: -80px -48px; }
+.ui-icon-arrowthick-1-w { background-position: -96px -48px; }
+.ui-icon-arrowthick-1-nw { background-position: -112px -48px; }
+.ui-icon-arrowthick-2-n-s { background-position: -128px -48px; }
+.ui-icon-arrowthick-2-ne-sw { background-position: -144px -48px; }
+.ui-icon-arrowthick-2-e-w { background-position: -160px -48px; }
+.ui-icon-arrowthick-2-se-nw { background-position: -176px -48px; }
+.ui-icon-arrowthickstop-1-n { background-position: -192px -48px; }
+.ui-icon-arrowthickstop-1-e { background-position: -208px -48px; }
+.ui-icon-arrowthickstop-1-s { background-position: -224px -48px; }
+.ui-icon-arrowthickstop-1-w { background-position: -240px -48px; }
+.ui-icon-arrowreturnthick-1-w { background-position: 0 -64px; }
+.ui-icon-arrowreturnthick-1-n { background-position: -16px -64px; }
+.ui-icon-arrowreturnthick-1-e { background-position: -32px -64px; }
+.ui-icon-arrowreturnthick-1-s { background-position: -48px -64px; }
+.ui-icon-arrowreturn-1-w { background-position: -64px -64px; }
+.ui-icon-arrowreturn-1-n { background-position: -80px -64px; }
+.ui-icon-arrowreturn-1-e { background-position: -96px -64px; }
+.ui-icon-arrowreturn-1-s { background-position: -112px -64px; }
+.ui-icon-arrowrefresh-1-w { background-position: -128px -64px; }
+.ui-icon-arrowrefresh-1-n { background-position: -144px -64px; }
+.ui-icon-arrowrefresh-1-e { background-position: -160px -64px; }
+.ui-icon-arrowrefresh-1-s { background-position: -176px -64px; }
+.ui-icon-arrow-4 { background-position: 0 -80px; }
+.ui-icon-arrow-4-diag { background-position: -16px -80px; }
+.ui-icon-extlink { background-position: -32px -80px; }
+.ui-icon-newwin { background-position: -48px -80px; }
+.ui-icon-refresh { background-position: -64px -80px; }
+.ui-icon-shuffle { background-position: -80px -80px; }
+.ui-icon-transfer-e-w { background-position: -96px -80px; }
+.ui-icon-transferthick-e-w { background-position: -112px -80px; }
+.ui-icon-folder-collapsed { background-position: 0 -96px; }
+.ui-icon-folder-open { background-position: -16px -96px; }
+.ui-icon-document { background-position: -32px -96px; }
+.ui-icon-document-b { background-position: -48px -96px; }
+.ui-icon-note { background-position: -64px -96px; }
+.ui-icon-mail-closed { background-position: -80px -96px; }
+.ui-icon-mail-open { background-position: -96px -96px; }
+.ui-icon-suitcase { background-position: -112px -96px; }
+.ui-icon-comment { background-position: -128px -96px; }
+.ui-icon-person { background-position: -144px -96px; }
+.ui-icon-print { background-position: -160px -96px; }
+.ui-icon-trash { background-position: -176px -96px; }
+.ui-icon-locked { background-position: -192px -96px; }
+.ui-icon-unlocked { background-position: -208px -96px; }
+.ui-icon-bookmark { background-position: -224px -96px; }
+.ui-icon-tag { background-position: -240px -96px; }
+.ui-icon-home { background-position: 0 -112px; }
+.ui-icon-flag { background-position: -16px -112px; }
+.ui-icon-calendar { background-position: -32px -112px; }
+.ui-icon-cart { background-position: -48px -112px; }
+.ui-icon-pencil { background-position: -64px -112px; }
+.ui-icon-clock { background-position: -80px -112px; }
+.ui-icon-disk { background-position: -96px -112px; }
+.ui-icon-calculator { background-position: -112px -112px; }
+.ui-icon-zoomin { background-position: -128px -112px; }
+.ui-icon-zoomout { background-position: -144px -112px; }
+.ui-icon-search { background-position: -160px -112px; }
+.ui-icon-wrench { background-position: -176px -112px; }
+.ui-icon-gear { background-position: -192px -112px; }
+.ui-icon-heart { background-position: -208px -112px; }
+.ui-icon-star { background-position: -224px -112px; }
+.ui-icon-link { background-position: -240px -112px; }
+.ui-icon-cancel { background-position: 0 -128px; }
+.ui-icon-plus { background-position: -16px -128px; }
+.ui-icon-plusthick { background-position: -32px -128px; }
+.ui-icon-minus { background-position: -48px -128px; }
+.ui-icon-minusthick { background-position: -64px -128px; }
+.ui-icon-close { background-position: -80px -128px; }
+.ui-icon-closethick { background-position: -96px -128px; }
+.ui-icon-key { background-position: -112px -128px; }
+.ui-icon-lightbulb { background-position: -128px -128px; }
+.ui-icon-scissors { background-position: -144px -128px; }
+.ui-icon-clipboard { background-position: -160px -128px; }
+.ui-icon-copy { background-position: -176px -128px; }
+.ui-icon-contact { background-position: -192px -128px; }
+.ui-icon-image { background-position: -208px -128px; }
+.ui-icon-video { background-position: -224px -128px; }
+.ui-icon-script { background-position: -240px -128px; }
+.ui-icon-alert { background-position: 0 -144px; }
+.ui-icon-info { background-position: -16px -144px; }
+.ui-icon-notice { background-position: -32px -144px; }
+.ui-icon-help { background-position: -48px -144px; }
+.ui-icon-check { background-position: -64px -144px; }
+.ui-icon-bullet { background-position: -80px -144px; }
+.ui-icon-radio-off { background-position: -96px -144px; }
+.ui-icon-radio-on { background-position: -112px -144px; }
+.ui-icon-pin-w { background-position: -128px -144px; }
+.ui-icon-pin-s { background-position: -144px -144px; }
+.ui-icon-play { background-position: 0 -160px; }
+.ui-icon-pause { background-position: -16px -160px; }
+.ui-icon-seek-next { background-position: -32px -160px; }
+.ui-icon-seek-prev { background-position: -48px -160px; }
+.ui-icon-seek-end { background-position: -64px -160px; }
+.ui-icon-seek-start { background-position: -80px -160px; }
+/* ui-icon-seek-first is deprecated, use ui-icon-seek-start instead */
+.ui-icon-seek-first { background-position: -80px -160px; }
+.ui-icon-stop { background-position: -96px -160px; }
+.ui-icon-eject { background-position: -112px -160px; }
+.ui-icon-volume-off { background-position: -128px -160px; }
+.ui-icon-volume-on { background-position: -144px -160px; }
+.ui-icon-power { background-position: 0 -176px; }
+.ui-icon-signal-diag { background-position: -16px -176px; }
+.ui-icon-signal { background-position: -32px -176px; }
+.ui-icon-battery-0 { background-position: -48px -176px; }
+.ui-icon-battery-1 { background-position: -64px -176px; }
+.ui-icon-battery-2 { background-position: -80px -176px; }
+.ui-icon-battery-3 { background-position: -96px -176px; }
+.ui-icon-circle-plus { background-position: 0 -192px; }
+.ui-icon-circle-minus { background-position: -16px -192px; }
+.ui-icon-circle-close { background-position: -32px -192px; }
+.ui-icon-circle-triangle-e { background-position: -48px -192px; }
+.ui-icon-circle-triangle-s { background-position: -64px -192px; }
+.ui-icon-circle-triangle-w { background-position: -80px -192px; }
+.ui-icon-circle-triangle-n { background-position: -96px -192px; }
+.ui-icon-circle-arrow-e { background-position: -112px -192px; }
+.ui-icon-circle-arrow-s { background-position: -128px -192px; }
+.ui-icon-circle-arrow-w { background-position: -144px -192px; }
+.ui-icon-circle-arrow-n { background-position: -160px -192px; }
+.ui-icon-circle-zoomin { background-position: -176px -192px; }
+.ui-icon-circle-zoomout { background-position: -192px -192px; }
+.ui-icon-circle-check { background-position: -208px -192px; }
+.ui-icon-circlesmall-plus { background-position: 0 -208px; }
+.ui-icon-circlesmall-minus { background-position: -16px -208px; }
+.ui-icon-circlesmall-close { background-position: -32px -208px; }
+.ui-icon-squaresmall-plus { background-position: -48px -208px; }
+.ui-icon-squaresmall-minus { background-position: -64px -208px; }
+.ui-icon-squaresmall-close { background-position: -80px -208px; }
+.ui-icon-grip-dotted-vertical { background-position: 0 -224px; }
+.ui-icon-grip-dotted-horizontal { background-position: -16px -224px; }
+.ui-icon-grip-solid-vertical { background-position: -32px -224px; }
+.ui-icon-grip-solid-horizontal { background-position: -48px -224px; }
+.ui-icon-gripsmall-diagonal-se { background-position: -64px -224px; }
+.ui-icon-grip-diagonal-se { background-position: -80px -224px; }
+
+
+/* Misc visuals
+----------------------------------*/
+
+/* Corner radius */
+.ui-corner-all, .ui-corner-top, .ui-corner-left, .ui-corner-tl { -moz-border-radius-topleft: 4px; -webkit-border-top-left-radius: 4px; -khtml-border-top-left-radius: 4px; border-top-left-radius: 4px; }
+.ui-corner-all, .ui-corner-top, .ui-corner-right, .ui-corner-tr { -moz-border-radius-topright: 4px; -webkit-border-top-right-radius: 4px; -khtml-border-top-right-radius: 4px; border-top-right-radius: 4px; }
+.ui-corner-all, .ui-corner-bottom, .ui-corner-left, .ui-corner-bl { -moz-border-radius-bottomleft: 4px; -webkit-border-bottom-left-radius: 4px; -khtml-border-bottom-left-radius: 4px; border-bottom-left-radius: 4px; }
+.ui-corner-all, .ui-corner-bottom, .ui-corner-right, .ui-corner-br { -moz-border-radius-bottomright: 4px; -webkit-border-bottom-right-radius: 4px; -khtml-border-bottom-right-radius: 4px; border-bottom-right-radius: 4px; }
+
+/* Overlays */
+.ui-widget-overlay { background: #aaaaaa url(images/ui-bg_flat_0_aaaaaa_40x100.png) 50% 50% repeat-x; opacity: .30;filter:Alpha(Opacity=30); }
+.ui-widget-shadow { margin: -8px 0 0 -8px; padding: 8px; background: #aaaaaa url(images/ui-bg_flat_0_aaaaaa_40x100.png) 50% 50% repeat-x; opacity: .30;filter:Alpha(Opacity=30); -moz-border-radius: 8px; -khtml-border-radius: 8px; -webkit-border-radius: 8px; border-radius: 8px; }/*!
+ * jQuery UI Resizable 1.8.24
+ *
+ * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Resizable#theming
+ */
+.ui-resizable { position: relative;}
+.ui-resizable-handle { position: absolute;font-size: 0.1px; display: block; }
+.ui-resizable-disabled .ui-resizable-handle, .ui-resizable-autohide .ui-resizable-handle { display: none; }
+.ui-resizable-n { cursor: n-resize; height: 7px; width: 100%; top: -5px; left: 0; }
+.ui-resizable-s { cursor: s-resize; height: 7px; width: 100%; bottom: -5px; left: 0; }
+.ui-resizable-e { cursor: e-resize; width: 7px; right: -5px; top: 0; height: 100%; }
+.ui-resizable-w { cursor: w-resize; width: 7px; left: -5px; top: 0; height: 100%; }
+.ui-resizable-se { cursor: se-resize; width: 12px; height: 12px; right: 1px; bottom: 1px; }
+.ui-resizable-sw { cursor: sw-resize; width: 9px; height: 9px; left: -5px; bottom: -5px; }
+.ui-resizable-nw { cursor: nw-resize; width: 9px; height: 9px; left: -5px; top: -5px; }
+.ui-resizable-ne { cursor: ne-resize; width: 9px; height: 9px; right: -5px; top: -5px;}/*!
+ * jQuery UI Selectable 1.8.24
+ *
+ * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Selectable#theming
+ */
+.ui-selectable-helper { position: absolute; z-index: 100; border:1px dotted black; }
+/*!
+ * jQuery UI Accordion 1.8.24
+ *
+ * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Accordion#theming
+ */
+/* IE/Win - Fix animation bug - #4615 */
+.ui-accordion { width: 100%; }
+.ui-accordion .ui-accordion-header { cursor: pointer; position: relative; margin-top: 1px; zoom: 1; }
+.ui-accordion .ui-accordion-li-fix { display: inline; }
+.ui-accordion .ui-accordion-header-active { border-bottom: 0 !important; }
+.ui-accordion .ui-accordion-header a { display: block; font-size: 1em; padding: .5em .5em .5em .7em; }
+.ui-accordion-icons .ui-accordion-header a { padding-left: 2.2em; }
+.ui-accordion .ui-accordion-header .ui-icon { position: absolute; left: .5em; top: 50%; margin-top: -8px; }
+.ui-accordion .ui-accordion-content { padding: 1em 2.2em; border-top: 0; margin-top: -2px; position: relative; top: 1px; margin-bottom: 2px; overflow: auto; display: none; zoom: 1; }
+.ui-accordion .ui-accordion-content-active { display: block; }
+/*!
+ * jQuery UI Autocomplete 1.8.24
+ *
+ * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Autocomplete#theming
+ */
+.ui-autocomplete { position: absolute; cursor: default; }	
+
+/* workarounds */
+* html .ui-autocomplete { width:1px; } /* without this, the menu expands to 100% in IE6 */
+
+/*
+ * jQuery UI Menu 1.8.24
+ *
+ * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Menu#theming
+ */
+.ui-menu {
+	list-style:none;
+	padding: 2px;
+	margin: 0;
+	display:block;
+	float: left;
+}
+.ui-menu .ui-menu {
+	margin-top: -3px;
+}
+.ui-menu .ui-menu-item {
+	margin:0;
+	padding: 0;
+	zoom: 1;
+	float: left;
+	clear: left;
+	width: 100%;
+}
+.ui-menu .ui-menu-item a {
+	text-decoration:none;
+	display:block;
+	padding:.2em .4em;
+	line-height:1.5;
+	zoom:1;
+}
+.ui-menu .ui-menu-item a.ui-state-hover,
+.ui-menu .ui-menu-item a.ui-state-active {
+	font-weight: normal;
+	margin: -1px;
+}
+/*!
+ * jQuery UI Button 1.8.24
+ *
+ * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Button#theming
+ */
+.ui-button { display: inline-block; position: relative; padding: 0; margin-right: .1em; text-decoration: none !important; cursor: pointer; text-align: center; zoom: 1; overflow: visible; } /* the overflow property removes extra width in IE */
+.ui-button-icon-only { width: 2.2em; } /* to make room for the icon, a width needs to be set here */
+button.ui-button-icon-only { width: 2.4em; } /* button elements seem to need a little more width */
+.ui-button-icons-only { width: 3.4em; } 
+button.ui-button-icons-only { width: 3.7em; } 
+
+/*button text element */
+.ui-button .ui-button-text { display: block; line-height: 1.4;  }
+.ui-button-text-only .ui-button-text { padding: .4em 1em; }
+.ui-button-icon-only .ui-button-text, .ui-button-icons-only .ui-button-text { padding: .4em; text-indent: -9999999px; }
+.ui-button-text-icon-primary .ui-button-text, .ui-button-text-icons .ui-button-text { padding: .4em 1em .4em 2.1em; }
+.ui-button-text-icon-secondary .ui-button-text, .ui-button-text-icons .ui-button-text { padding: .4em 2.1em .4em 1em; }
+.ui-button-text-icons .ui-button-text { padding-left: 2.1em; padding-right: 2.1em; }
+/* no icon support for input elements, provide padding by default */
+input.ui-button { padding: .4em 1em; }
+
+/*button icon element(s) */
+.ui-button-icon-only .ui-icon, .ui-button-text-icon-primary .ui-icon, .ui-button-text-icon-secondary .ui-icon, .ui-button-text-icons .ui-icon, .ui-button-icons-only .ui-icon { position: absolute; top: 50%; margin-top: -8px; }
+.ui-button-icon-only .ui-icon { left: 50%; margin-left: -8px; }
+.ui-button-text-icon-primary .ui-button-icon-primary, .ui-button-text-icons .ui-button-icon-primary, .ui-button-icons-only .ui-button-icon-primary { left: .5em; }
+.ui-button-text-icon-secondary .ui-button-icon-secondary, .ui-button-text-icons .ui-button-icon-secondary, .ui-button-icons-only .ui-button-icon-secondary { right: .5em; }
+.ui-button-text-icons .ui-button-icon-secondary, .ui-button-icons-only .ui-button-icon-secondary { right: .5em; }
+
+/*button sets*/
+.ui-buttonset { margin-right: 7px; }
+.ui-buttonset .ui-button { margin-left: 0; margin-right: -.3em; }
+
+/* workarounds */
+button.ui-button::-moz-focus-inner { border: 0; padding: 0; } /* reset extra padding in Firefox */
+/*!
+ * jQuery UI Dialog 1.8.24
+ *
+ * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Dialog#theming
+ */
+.ui-dialog { position: absolute; padding: .2em; width: 300px; overflow: hidden; }
+.ui-dialog .ui-dialog-titlebar { padding: .4em 1em; position: relative;  }
+.ui-dialog .ui-dialog-title { float: left; margin: .1em 16px .1em 0; } 
+.ui-dialog .ui-dialog-titlebar-close { position: absolute; right: .3em; top: 50%; width: 19px; margin: -10px 0 0 0; padding: 1px; height: 18px; }
+.ui-dialog .ui-dialog-titlebar-close span { display: block; margin: 1px; }
+.ui-dialog .ui-dialog-titlebar-close:hover, .ui-dialog .ui-dialog-titlebar-close:focus { padding: 0; }
+.ui-dialog .ui-dialog-content { position: relative; border: 0; padding: .5em 1em; background: none; overflow: auto; zoom: 1; }
+.ui-dialog .ui-dialog-buttonpane { text-align: left; border-width: 1px 0 0 0; background-image: none; margin: .5em 0 0 0; padding: .3em 1em .5em .4em; }
+.ui-dialog .ui-dialog-buttonpane .ui-dialog-buttonset { float: right; }
+.ui-dialog .ui-dialog-buttonpane button { margin: .5em .4em .5em 0; cursor: pointer; }
+.ui-dialog .ui-resizable-se { width: 14px; height: 14px; right: 3px; bottom: 3px; }
+.ui-draggable .ui-dialog-titlebar { cursor: move; }
+/*!
+ * jQuery UI Slider 1.8.24
+ *
+ * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Slider#theming
+ */
+.ui-slider { position: relative; text-align: left; }
+.ui-slider .ui-slider-handle { position: absolute; z-index: 2; width: 1.2em; height: 1.2em; cursor: default; }
+.ui-slider .ui-slider-range { position: absolute; z-index: 1; font-size: .7em; display: block; border: 0; background-position: 0 0; }
+
+.ui-slider-horizontal { height: .8em; }
+.ui-slider-horizontal .ui-slider-handle { top: -.3em; margin-left: -.6em; }
+.ui-slider-horizontal .ui-slider-range { top: 0; height: 100%; }
+.ui-slider-horizontal .ui-slider-range-min { left: 0; }
+.ui-slider-horizontal .ui-slider-range-max { right: 0; }
+
+.ui-slider-vertical { width: .8em; height: 100px; }
+.ui-slider-vertical .ui-slider-handle { left: -.3em; margin-left: 0; margin-bottom: -.6em; }
+.ui-slider-vertical .ui-slider-range { left: 0; width: 100%; }
+.ui-slider-vertical .ui-slider-range-min { bottom: 0; }
+.ui-slider-vertical .ui-slider-range-max { top: 0; }/*!
+ * jQuery UI Tabs 1.8.24
+ *
+ * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Tabs#theming
+ */
+.ui-tabs { position: relative; padding: .2em; zoom: 1; } /* position: relative prevents IE scroll bug (element with position: relative inside container with overflow: auto appear as "fixed") */
+.ui-tabs .ui-tabs-nav { margin: 0; padding: .2em .2em 0; }
+.ui-tabs .ui-tabs-nav li { list-style: none; float: left; position: relative; top: 1px; margin: 0 .2em 1px 0; border-bottom: 0 !important; padding: 0; white-space: nowrap; }
+.ui-tabs .ui-tabs-nav li a { float: left; padding: .5em 1em; text-decoration: none; }
+.ui-tabs .ui-tabs-nav li.ui-tabs-selected { margin-bottom: 0; padding-bottom: 1px; }
+.ui-tabs .ui-tabs-nav li.ui-tabs-selected a, .ui-tabs .ui-tabs-nav li.ui-state-disabled a, .ui-tabs .ui-tabs-nav li.ui-state-processing a { cursor: text; }
+.ui-tabs .ui-tabs-nav li a, .ui-tabs.ui-tabs-collapsible .ui-tabs-nav li.ui-tabs-selected a { cursor: pointer; } /* first selector in group seems obsolete, but required to overcome bug in Opera applying cursor: text overall if defined elsewhere... */
+.ui-tabs .ui-tabs-panel { display: block; border-width: 0; padding: 1em 1.4em; background: none; }
+.ui-tabs .ui-tabs-hide { display: none !important; }
+/*!
+ * jQuery UI Datepicker 1.8.24
+ *
+ * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Datepicker#theming
+ */
+.ui-datepicker { width: 17em; padding: .2em .2em 0; display: none; }
+.ui-datepicker .ui-datepicker-header { position:relative; padding:.2em 0; }
+.ui-datepicker .ui-datepicker-prev, .ui-datepicker .ui-datepicker-next { position:absolute; top: 2px; width: 1.8em; height: 1.8em; }
+.ui-datepicker .ui-datepicker-prev-hover, .ui-datepicker .ui-datepicker-next-hover { top: 1px; }
+.ui-datepicker .ui-datepicker-prev { left:2px; }
+.ui-datepicker .ui-datepicker-next { right:2px; }
+.ui-datepicker .ui-datepicker-prev-hover { left:1px; }
+.ui-datepicker .ui-datepicker-next-hover { right:1px; }
+.ui-datepicker .ui-datepicker-prev span, .ui-datepicker .ui-datepicker-next span { display: block; position: absolute; left: 50%; margin-left: -8px; top: 50%; margin-top: -8px;  }
+.ui-datepicker .ui-datepicker-title { margin: 0 2.3em; line-height: 1.8em; text-align: center; }
+.ui-datepicker .ui-datepicker-title select { font-size:1em; margin:1px 0; }
+.ui-datepicker select.ui-datepicker-month-year {width: 100%;}
+.ui-datepicker select.ui-datepicker-month, 
+.ui-datepicker select.ui-datepicker-year { width: 49%;}
+.ui-datepicker table {width: 100%; font-size: .9em; border-collapse: collapse; margin:0 0 .4em; }
+.ui-datepicker th { padding: .7em .3em; text-align: center; font-weight: bold; border: 0;  }
+.ui-datepicker td { border: 0; padding: 1px; }
+.ui-datepicker td span, .ui-datepicker td a { display: block; padding: .2em; text-align: right; text-decoration: none; }
+.ui-datepicker .ui-datepicker-buttonpane { background-image: none; margin: .7em 0 0 0; padding:0 .2em; border-left: 0; border-right: 0; border-bottom: 0; }
+.ui-datepicker .ui-datepicker-buttonpane button { float: right; margin: .5em .2em .4em; cursor: pointer; padding: .2em .6em .3em .6em; width:auto; overflow:visible; }
+.ui-datepicker .ui-datepicker-buttonpane button.ui-datepicker-current { float:left; }
+
+/* with multiple calendars */
+.ui-datepicker.ui-datepicker-multi { width:auto; }
+.ui-datepicker-multi .ui-datepicker-group { float:left; }
+.ui-datepicker-multi .ui-datepicker-group table { width:95%; margin:0 auto .4em; }
+.ui-datepicker-multi-2 .ui-datepicker-group { width:50%; }
+.ui-datepicker-multi-3 .ui-datepicker-group { width:33.3%; }
+.ui-datepicker-multi-4 .ui-datepicker-group { width:25%; }
+.ui-datepicker-multi .ui-datepicker-group-last .ui-datepicker-header { border-left-width:0; }
+.ui-datepicker-multi .ui-datepicker-group-middle .ui-datepicker-header { border-left-width:0; }
+.ui-datepicker-multi .ui-datepicker-buttonpane { clear:left; }
+.ui-datepicker-row-break { clear:both; width:100%; font-size:0em; }
+
+/* RTL support */
+.ui-datepicker-rtl { direction: rtl; }
+.ui-datepicker-rtl .ui-datepicker-prev { right: 2px; left: auto; }
+.ui-datepicker-rtl .ui-datepicker-next { left: 2px; right: auto; }
+.ui-datepicker-rtl .ui-datepicker-prev:hover { right: 1px; left: auto; }
+.ui-datepicker-rtl .ui-datepicker-next:hover { left: 1px; right: auto; }
+.ui-datepicker-rtl .ui-datepicker-buttonpane { clear:right; }
+.ui-datepicker-rtl .ui-datepicker-buttonpane button { float: left; }
+.ui-datepicker-rtl .ui-datepicker-buttonpane button.ui-datepicker-current { float:right; }
+.ui-datepicker-rtl .ui-datepicker-group { float:right; }
+.ui-datepicker-rtl .ui-datepicker-group-last .ui-datepicker-header { border-right-width:0; border-left-width:1px; }
+.ui-datepicker-rtl .ui-datepicker-group-middle .ui-datepicker-header { border-right-width:0; border-left-width:1px; }
+
+/* IE6 IFRAME FIX (taken from datepicker 1.5.3 */
+.ui-datepicker-cover {
+    position: absolute; /*must have*/
+    z-index: -1; /*must have*/
+    filter: mask(); /*must have*/
+    top: -4px; /*must have*/
+    left: -4px; /*must have*/
+    width: 200px; /*must have*/
+    height: 200px; /*must have*/
+}/*!
+ * jQuery UI Progressbar 1.8.24
+ *
+ * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Progressbar#theming
+ */
+.ui-progressbar { height:2em; text-align: left; overflow: hidden; }
+.ui-progressbar .ui-progressbar-value {margin: -1px; height:100%; }
\ No newline at end of file

code/LanBortalWeb/WebContent/resources/style/template1/css/style.css

@@ -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;
 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"
-	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: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"
+<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: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
-		template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition 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"
-				listener="#{productShopView.initShopView}" />
+			<f:event type="preRenderView" listener="#{productShopView.initShopView}" />
 		</f:metadata>
 		</f:metadata>
 
 
 		<ui:define name="title">
 		<ui:define name="title">
@@ -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 @@
 							<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
-					commitaction="#{productShopView.commitShoppingCart()}"
-					items="#{productShopView.shoppingcart}"
-					commitValue="#{i18n['productshop.commit']}" />
+				<h:outputScript library="primefaces" name="jquery/jquery.js" />
+				<div style="margin-top: 5px;">
+					<h:commandButton action="#{cc.attrs.commitaction}" id="commitbutton-top" value="#{cc.attrs.commitValue}" />
+				</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 @@
 
 
 				$(function() {
 				$(function() {
 					$("#shoppingcartform\\:barcode").focus();
 					$("#shoppingcartform\\:barcode").focus();
-				})
+
+				});
 
 
 				function blip() {
 				function blip() {
 					blipSnd.play();
 					blipSnd.play();

code/LanBortalWeb/WebContent/useradmin/edit.xhtml

@@ -22,7 +22,7 @@
 			</p>
 			</p>
 			<users:edit commitaction="#{userView.saveUser()}" commitvalue="#{i18n['user.save']}" />
 			<users:edit commitaction="#{userView.saveUser()}" commitvalue="#{i18n['user.save']}" />
 
 
-			<h:form id="roleform" rendered="#{roleView.canReadRoles()}">
+			<h:form id="roleform" rendered="#{roleView.canReadRoles}">
 
 
 				<h2>
 				<h2>
 					<h:outputText value="#{i18n['user.roles']}:" />
 					<h:outputText value="#{i18n['user.roles']}:" />
@@ -31,7 +31,7 @@
 					<f:selectItems var="roleitem" itemLabel="#{roleitem.name}" value="#{roleDataView.roles}" />
 					<f:selectItems var="roleitem" itemLabel="#{roleitem.name}" value="#{roleDataView.roles}" />
 				</h:selectManyCheckbox>
 				</h:selectManyCheckbox>
 				<div>
 				<div>
-					<h:message rendered="#{roleView.canReadRoles()}" for="roles" />
+					<h:message rendered="#{roleView.canReadRoles}" for="roles" />
 				</div>
 				</div>
 				<h:commandButton action="#{userView.saveRoles}" value="#{i18n['user.saveRoles']}" />
 				<h:commandButton action="#{userView.saveRoles}" value="#{i18n['user.saveRoles']}" />