Merge branch 'master' of dev.intra.insomnia.fi:/data/bortal

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

@@ -33,6 +33,7 @@ import javax.persistence.Version;
 @Table(name = "bills")
 @Table(name = "bills")
 @NamedQueries( {
 @NamedQueries( {
         @NamedQuery(name = "Bill.findAll", query = "SELECT b FROM Bill b"),
         @NamedQuery(name = "Bill.findAll", query = "SELECT b FROM Bill b"),
+        
         @NamedQuery(name = "Bill.findByDueDate", query = "SELECT b FROM Bill b WHERE b.dueDate = :dueDate"),
         @NamedQuery(name = "Bill.findByDueDate", query = "SELECT b FROM Bill b WHERE b.dueDate = :dueDate"),
         @NamedQuery(name = "Bill.findByPaidDate", query = "SELECT b FROM Bill b WHERE b.paidDate = :paidDate"),
         @NamedQuery(name = "Bill.findByPaidDate", query = "SELECT b FROM Bill b WHERE b.paidDate = :paidDate"),
         @NamedQuery(name = "Bill.findByReferenceNumber", query = "SELECT b FROM Bill b WHERE b.referenceNumber = :referenceNumber"),
         @NamedQuery(name = "Bill.findByReferenceNumber", query = "SELECT b FROM Bill b WHERE b.referenceNumber = :referenceNumber"),

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

@@ -25,8 +25,9 @@ import javax.persistence.Version;
 @Table(name = "bill_lines")
 @Table(name = "bill_lines")
 @NamedQueries( {
 @NamedQueries( {
         @NamedQuery(name = "BillLine.findAll", query = "SELECT b FROM BillLine b"),
         @NamedQuery(name = "BillLine.findAll", query = "SELECT b FROM BillLine b"),
+
         @NamedQuery(name = "BillLine.findByProduct", query = "SELECT b FROM BillLine b WHERE b.name = :name"),
         @NamedQuery(name = "BillLine.findByProduct", query = "SELECT b FROM BillLine b WHERE b.name = :name"),
-        @NamedQuery(name = "BillLine.findByUnits", query = "SELECT b FROM BillLine b WHERE b.units = :quantity"),
+        @NamedQuery(name = "BillLine.findByQuantity", query = "SELECT b FROM BillLine b WHERE b.quantity = :quantity"),
         @NamedQuery(name = "BillLine.findByUnitPrice", query = "SELECT b FROM BillLine b WHERE b.unitPrice = :unitPrice"),
         @NamedQuery(name = "BillLine.findByUnitPrice", query = "SELECT b FROM BillLine b WHERE b.unitPrice = :unitPrice"),
         @NamedQuery(name = "BillLine.findByVat", query = "SELECT b FROM BillLine b WHERE b.vat = :vat") })
         @NamedQuery(name = "BillLine.findByVat", query = "SELECT b FROM BillLine b WHERE b.vat = :vat") })
 public class BillLine implements EventChildInterface {
 public class BillLine implements EventChildInterface {

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

@@ -26,7 +26,8 @@ import javax.persistence.Version;
 @Table(name = "event_status", uniqueConstraints = { @UniqueConstraint(columnNames = { "status_name" }) })
 @Table(name = "event_status", uniqueConstraints = { @UniqueConstraint(columnNames = { "status_name" }) })
 @NamedQueries( {
 @NamedQueries( {
         @NamedQuery(name = "EventStatus.findAll", query = "SELECT e FROM EventStatus e"),
         @NamedQuery(name = "EventStatus.findAll", query = "SELECT e FROM EventStatus e"),
-        @NamedQuery(name = "EventStatus.findByStatusName", query = "SELECT e FROM EventStatus e WHERE e.statusName = :name") })
+
+        @NamedQuery(name = "EventStatus.findByStatusName", query = "SELECT e FROM EventStatus e WHERE e.name = :name") })
 public class EventStatus implements ModelInterface<Integer> {
 public class EventStatus implements ModelInterface<Integer> {
 
 
     private static final long serialVersionUID = 1L;
     private static final long serialVersionUID = 1L;

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

@@ -29,8 +29,9 @@ import javax.persistence.Version;
 @Table(name = "groups")
 @Table(name = "groups")
 @NamedQueries( {
 @NamedQueries( {
         @NamedQuery(name = "PlaceGroup.findAll", query = "SELECT p FROM PlaceGroup p"),
         @NamedQuery(name = "PlaceGroup.findAll", query = "SELECT p FROM PlaceGroup p"),
+
         @NamedQuery(name = "PlaceGroup.findByCreated", query = "SELECT p FROM PlaceGroup p WHERE p.created = :created"),
         @NamedQuery(name = "PlaceGroup.findByCreated", query = "SELECT p FROM PlaceGroup p WHERE p.created = :created"),
-        @NamedQuery(name = "PlaceGroup.findByEdited", query = "SELECT p FROM PlaceGroup p WHERE p.edited = :edited"),
+        //@NamedQuery(name = "PlaceGroup.findByEdited", query = "SELECT p FROM PlaceGroup p WHERE p.edited = :edited"),
         @NamedQuery(name = "PlaceGroup.findByCode", query = "SELECT p FROM PlaceGroup p WHERE p.code = :code"),
         @NamedQuery(name = "PlaceGroup.findByCode", query = "SELECT p FROM PlaceGroup p WHERE p.code = :code"),
         @NamedQuery(name = "PlaceGroup.findByName", query = "SELECT p FROM PlaceGroup p WHERE p.name = :name"),
         @NamedQuery(name = "PlaceGroup.findByName", query = "SELECT p FROM PlaceGroup p WHERE p.name = :name"),
         @NamedQuery(name = "PlaceGroup.findByActive", query = "SELECT p FROM PlaceGroup p WHERE p.active = :active"),
         @NamedQuery(name = "PlaceGroup.findByActive", query = "SELECT p FROM PlaceGroup p WHERE p.active = :active"),