muutettu Date kentät Calendar kentiksi.

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

@@ -6,7 +6,7 @@
 package fi.insomnia.bortal.model;
 
 import java.math.BigDecimal;
-import java.util.Date;
+import java.util.Calendar;
 import java.util.List;
 
 import javax.persistence.Column;
@@ -52,11 +52,11 @@ public class AccountEvent implements ModelInterface {
 
     @Column(name = "event_time", nullable = false)
     @Temporal(TemporalType.TIMESTAMP)
-    private Date eventTime;
+    private Calendar eventTime;
 
     @Column(name = "delivered")
     @Temporal(TemporalType.TIMESTAMP)
-    private Date delivered;
+    private Calendar delivered;
 
     @JoinColumn(name = "food_waves_id", referencedColumnName = "food_waves_id")
     @ManyToOne
@@ -112,26 +112,26 @@ public class AccountEvent implements ModelInterface {
     }
 
     public AccountEvent(Integer accountEventsId, BigDecimal unitPrice,
-            BigDecimal unitCount, Date eventTime) {
+            BigDecimal unitCount, Calendar eventTime) {
         this.id = accountEventsId;
         this.setUnitPrice(unitPrice);
         this.setUnits(unitCount);
         this.eventTime = eventTime;
     }
 
-    public Date getEventTime() {
+    public Calendar getEventTime() {
         return eventTime;
     }
 
-    public void setEventTime(Date eventTime) {
+    public void setEventTime(Calendar eventTime) {
         this.eventTime = eventTime;
     }
 
-    public Date getDelivered() {
+    public Calendar getDelivered() {
         return delivered;
     }
 
-    public void setDelivered(Date delivered) {
+    public void setDelivered(Calendar delivered) {
         this.delivered = delivered;
     }
 

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

@@ -4,7 +4,7 @@
  */
 package fi.insomnia.bortal.model;
 
-import java.util.Date;
+import java.util.Calendar;
 import java.util.List;
 
 import javax.persistence.Column;
@@ -49,11 +49,11 @@ public class Bill implements ModelInterface {
 
     @Column(name = "due_date")
     @Temporal(TemporalType.TIMESTAMP)
-    private Date dueDate;
+    private Calendar dueDate;
 
     @Column(name = "paid_date")
     @Temporal(TemporalType.TIMESTAMP)
-    private Date paidDate;
+    private Calendar paidDate;
 
     @Column(name = "reference_number")
     private String referenceNumber;
@@ -94,19 +94,19 @@ public class Bill implements ModelInterface {
         this.id = billsId;
     }
 
-    public Date getDueDate() {
+    public Calendar getDueDate() {
         return dueDate;
     }
 
-    public void setDueDate(Date dueDate) {
+    public void setDueDate(Calendar dueDate) {
         this.dueDate = dueDate;
     }
 
-    public Date getPaidDate() {
+    public Calendar getPaidDate() {
         return paidDate;
     }
 
-    public void setPaidDate(Date paidDate) {
+    public void setPaidDate(Calendar paidDate) {
         this.paidDate = paidDate;
     }
 

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

@@ -5,7 +5,7 @@
 
 package fi.insomnia.bortal.model;
 
-import java.util.Date;
+import java.util.Calendar;
 import java.util.List;
 
 import javax.persistence.CascadeType;
@@ -53,23 +53,23 @@ public class Compo implements ModelInterface {
 
     @Column(name = "compo_start")
     @Temporal(TemporalType.TIMESTAMP)
-    private Date startTime;
+    private Calendar startTime;
 
     @Column(name = "vote_start")
     @Temporal(TemporalType.TIMESTAMP)
-    private Date voteStart;
+    private Calendar voteStart;
 
     @Column(name = "vote_end")
     @Temporal(TemporalType.TIMESTAMP)
-    private Date voteEnd;
+    private Calendar voteEnd;
 
     @Column(name = "submit_start")
     @Temporal(TemporalType.TIMESTAMP)
-    private Date submitStart;
+    private Calendar submitStart;
 
     @Column(name = "submit_end")
     @Temporal(TemporalType.TIMESTAMP)
-    private Date submitEnd;
+    private Calendar submitEnd;
 
     @Lob
     @Column(name = "description")
@@ -120,43 +120,43 @@ public class Compo implements ModelInterface {
         this.name = compoName;
     }
 
-    public Date getStartTime() {
+    public Calendar getStartTime() {
         return startTime;
     }
 
-    public void setStartTime(Date compoStart) {
+    public void setStartTime(Calendar compoStart) {
         this.startTime = compoStart;
     }
 
-    public Date getVoteStart() {
+    public Calendar getVoteStart() {
         return voteStart;
     }
 
-    public void setVoteStart(Date voteStart) {
+    public void setVoteStart(Calendar voteStart) {
         this.voteStart = voteStart;
     }
 
-    public Date getVoteEnd() {
+    public Calendar getVoteEnd() {
         return voteEnd;
     }
 
-    public void setVoteEnd(Date voteEnd) {
+    public void setVoteEnd(Calendar voteEnd) {
         this.voteEnd = voteEnd;
     }
 
-    public Date getSubmitStart() {
+    public Calendar getSubmitStart() {
         return submitStart;
     }
 
-    public void setSubmitStart(Date submitStart) {
+    public void setSubmitStart(Calendar submitStart) {
         this.submitStart = submitStart;
     }
 
-    public Date getSubmitEnd() {
+    public Calendar getSubmitEnd() {
         return submitEnd;
     }
 
-    public void setSubmitEnd(Date submitEnd) {
+    public void setSubmitEnd(Calendar submitEnd) {
         this.submitEnd = submitEnd;
     }
 

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

@@ -5,7 +5,7 @@
 
 package fi.insomnia.bortal.model;
 
-import java.util.Date;
+import java.util.Calendar;
 import java.util.List;
 
 import javax.persistence.CascadeType;
@@ -48,7 +48,7 @@ public class CompoEntry implements ModelInterface {
 
     @Column(name = "entry_created", nullable = false)
     @Temporal(TemporalType.TIMESTAMP)
-    private Date created;
+    private Calendar created;
 
     @Column(name = "entry_name", nullable = false)
     private String name;
@@ -108,17 +108,17 @@ public class CompoEntry implements ModelInterface {
         this.id = entriesId;
     }
 
-    public CompoEntry(Integer entriesId, Date entryCreated, String entryName) {
+    public CompoEntry(Integer entriesId, Calendar entryCreated, String entryName) {
         this.id = entriesId;
         this.created = entryCreated;
         this.name = entryName;
     }
 
-    public Date getCreated() {
+    public Calendar getCreated() {
         return created;
     }
 
-    public void setCreated(Date entryCreated) {
+    public void setCreated(Calendar entryCreated) {
         this.created = entryCreated;
     }
 

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

@@ -5,7 +5,7 @@
 
 package fi.insomnia.bortal.model;
 
-import java.util.Date;
+import java.util.Calendar;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
@@ -61,7 +61,7 @@ public class CompoEntryFile implements ModelInterface {
 
     @Column(name = "uploaded", nullable = false)
     @Temporal(TemporalType.TIMESTAMP)
-    private Date uploaded;
+    private Calendar uploaded;
 
     @JoinColumn(name = "entries_id", referencedColumnName = "entries_id", nullable = false)
     @ManyToOne(optional = false)
@@ -88,7 +88,7 @@ public class CompoEntryFile implements ModelInterface {
         this.id = entryFilesId;
     }
 
-    public CompoEntryFile(Integer entryFilesId, Date uploaded) {
+    public CompoEntryFile(Integer entryFilesId, Calendar uploaded) {
         this.id = entryFilesId;
         this.uploaded = uploaded;
     }
@@ -133,11 +133,11 @@ public class CompoEntryFile implements ModelInterface {
         this.fileData = fileData;
     }
 
-    public Date getUploaded() {
+    public Calendar getUploaded() {
         return uploaded;
     }
 
-    public void setUploaded(Date uploaded) {
+    public void setUploaded(Calendar uploaded) {
         this.uploaded = uploaded;
     }
 

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

@@ -4,7 +4,7 @@
  */
 package fi.insomnia.bortal.model;
 
-import java.util.Date;
+import java.util.Calendar;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
@@ -34,9 +34,9 @@ public class DiscountInstance implements ModelInterface {
     @Column(name = "discounts_instances_id", nullable = false)
     private Integer id;
 
-    @Column(name = "create_time", nullable = false, columnDefinition = "timestamptz default now()")
+    @Column(name = "create_time", nullable = false)
     @Temporal(TemporalType.TIMESTAMP)
-    private Date createTime = new Date();
+    private Calendar createTime = Calendar.getInstance();
 
     @JoinColumn(name = "account_events_id", referencedColumnName = "account_events_id")
     @ManyToOne
@@ -147,11 +147,11 @@ public class DiscountInstance implements ModelInterface {
         this.jpaVersionField = jpaVersionField;
     }
 
-    public void setCreateTime(Date createTime) {
+    public void setCreateTime(Calendar createTime) {
         this.createTime = createTime;
     }
 
-    public Date getCreateTime() {
+    public Calendar getCreateTime() {
         return createTime;
     }
 }

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

@@ -4,7 +4,7 @@
  */
 package fi.insomnia.bortal.model;
 
-import java.util.Date;
+import java.util.Calendar;
 import java.util.List;
 
 import javax.persistence.CascadeType;
@@ -46,11 +46,11 @@ public class Event implements ModelInterface {
 
     @Column(name = "start_time")
     @Temporal(TemporalType.TIMESTAMP)
-    private Date startTime;
+    private Calendar startTime;
 
     @Column(name = "end_time")
     @Temporal(TemporalType.TIMESTAMP)
-    private Date endTime;
+    private Calendar endTime;
 
     @Column(name = "name", nullable = false)
     private String name;
@@ -98,19 +98,19 @@ public class Event implements ModelInterface {
         this.name = name;
     }
 
-    public Date getStartTime() {
+    public Calendar getStartTime() {
         return startTime;
     }
 
-    public void setStartTime(Date startTime) {
+    public void setStartTime(Calendar startTime) {
         this.startTime = startTime;
     }
 
-    public Date getEndTime() {
+    public Calendar getEndTime() {
         return endTime;
     }
 
-    public void setEndTime(Date endTime) {
+    public void setEndTime(Calendar endTime) {
         this.endTime = endTime;
     }
 

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

@@ -4,7 +4,7 @@
  */
 package fi.insomnia.bortal.model;
 
-import java.util.Date;
+import java.util.Calendar;
 import java.util.List;
 
 import javax.persistence.Column;
@@ -50,7 +50,7 @@ public class FoodWave implements ModelInterface {
 
     @Column(name = "wave_time")
     @Temporal(TemporalType.TIMESTAMP)
-    private Date time;
+    private Calendar time;
 
     @Column(name = "wave_closed", nullable = false, columnDefinition = "boolean default false")
     private boolean closed = false;
@@ -91,11 +91,11 @@ public class FoodWave implements ModelInterface {
         this.description = waveDescription;
     }
 
-    public Date getTime() {
+    public Calendar getTime() {
         return time;
     }
 
-    public void setTime(Date waveTime) {
+    public void setTime(Calendar waveTime) {
         this.time = waveTime;
     }
 

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

@@ -4,7 +4,7 @@
  */
 package fi.insomnia.bortal.model;
 
-import java.util.Date;
+import java.util.Calendar;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
@@ -44,7 +44,7 @@ public class GroupMembership implements ModelInterface {
 
     @Column(name = "invite_accepted")
     @Temporal(TemporalType.TIMESTAMP)
-    private Date inviteAccepted;
+    private Calendar inviteAccepted;
 
     @Column(name = "invite_email")
     private String inviteEmail;
@@ -75,11 +75,11 @@ public class GroupMembership implements ModelInterface {
         this.id = groupMembershipsId;
     }
 
-    public Date getInviteAccepted() {
+    public Calendar getInviteAccepted() {
         return inviteAccepted;
     }
 
-    public void setInviteAccepted(Date inviteAccepted) {
+    public void setInviteAccepted(Calendar inviteAccepted) {
         this.inviteAccepted = inviteAccepted;
     }
 

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

@@ -4,7 +4,7 @@
  */
 package fi.insomnia.bortal.model;
 
-import java.util.Date;
+import java.util.Calendar;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
@@ -28,7 +28,6 @@ import javax.persistence.Version;
 @Table(name = "event_log")
 @NamedQueries( {
         @NamedQuery(name = "LogEntry.findAll", query = "SELECT l FROM LogEntry l"),
-
         @NamedQuery(name = "LogEntry.findByTime", query = "SELECT l FROM LogEntry l WHERE l.time = :time"),
         @NamedQuery(name = "LogEntry.findByDescription", query = "SELECT l FROM LogEntry l WHERE l.description = :description") })
 public class LogEntry implements ModelInterface {
@@ -42,7 +41,7 @@ public class LogEntry implements ModelInterface {
 
     @Column(name = "event_time", nullable = false)
     @Temporal(TemporalType.TIMESTAMP)
-    private Date time;
+    private Calendar time = Calendar.getInstance();
 
     @Lob
     @Column(name = "event_description")
@@ -67,16 +66,16 @@ public class LogEntry implements ModelInterface {
         this.id = eventLogId;
     }
 
-    public LogEntry(Integer eventLogId, Date eventTime) {
+    public LogEntry(Integer eventLogId, Calendar eventTime) {
         this.id = eventLogId;
         this.time = eventTime;
     }
 
-    public Date getTime() {
+    public Calendar getTime() {
         return time;
     }
 
-    public void setTime(Date eventTime) {
+    public void setTime(Calendar eventTime) {
         this.time = eventTime;
     }
 

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

@@ -4,7 +4,7 @@
  */
 package fi.insomnia.bortal.model;
 
-import java.util.Date;
+import java.util.Calendar;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
@@ -57,11 +57,11 @@ public class News implements ModelInterface {
 
     @Column(name = "publish")
     @Temporal(TemporalType.TIMESTAMP)
-    private Date publish;
+    private Calendar publish;
 
     @Column(name = "expire")
     @Temporal(TemporalType.TIMESTAMP)
-    private Date expire;
+    private Calendar expire;
 
     @Column(name = "priority", nullable = false)
     private int priority;
@@ -111,19 +111,19 @@ public class News implements ModelInterface {
         this.bodyAbstract = abstract1;
     }
 
-    public Date getPublish() {
+    public Calendar getPublish() {
         return publish;
     }
 
-    public void setPublish(Date publish) {
+    public void setPublish(Calendar publish) {
         this.publish = publish;
     }
 
-    public Date getExpire() {
+    public Calendar getExpire() {
         return expire;
     }
 
-    public void setExpire(Date expire) {
+    public void setExpire(Calendar expire) {
         this.expire = expire;
     }
 

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

@@ -4,7 +4,7 @@
  */
 package fi.insomnia.bortal.model;
 
-import java.util.Date;
+import java.util.Calendar;
 import java.util.List;
 
 import javax.persistence.CascadeType;
@@ -48,11 +48,11 @@ public class PlaceGroup implements ModelInterface {
 
     @Column(name = "group_created", nullable = false)
     @Temporal(TemporalType.TIMESTAMP)
-    private Date created;
+    private Calendar created;
 
     @Column(name = "group_edited", nullable = false)
     @Temporal(TemporalType.TIMESTAMP)
-    private Date edited;
+    private Calendar edited;
 
     @Column(name = "group_code")
     private String code;
@@ -88,7 +88,7 @@ public class PlaceGroup implements ModelInterface {
         this.id = groupsId;
     }
 
-    public PlaceGroup(Integer groupsId, Date groupCreated, Date groupEdited,
+    public PlaceGroup(Integer groupsId, Calendar groupCreated, Calendar groupEdited,
             boolean groupActive) {
         this.id = groupsId;
         this.created = groupCreated;
@@ -96,19 +96,19 @@ public class PlaceGroup implements ModelInterface {
         this.active = groupActive;
     }
 
-    public Date getCreated() {
+    public Calendar getCreated() {
         return created;
     }
 
-    public void setCreated(Date groupCreated) {
+    public void setCreated(Calendar groupCreated) {
         this.created = groupCreated;
     }
 
-    public Date getEdited() {
+    public Calendar getEdited() {
         return edited;
     }
 
-    public void setEdited(Date groupEdited) {
+    public void setEdited(Calendar groupEdited) {
         this.edited = groupEdited;
     }
 

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

@@ -5,7 +5,7 @@
 
 package fi.insomnia.bortal.model;
 
-import java.util.Date;
+import java.util.Calendar;
 import java.util.List;
 
 import javax.persistence.CascadeType;
@@ -45,7 +45,7 @@ public class PrintedCard implements ModelInterface {
 
     @Column(name = "print_time", nullable = false)
     @Temporal(TemporalType.TIMESTAMP)
-    private Date printTime;
+    private Calendar printTime;
 
     @Column(name = "barcode")
     private String barcode;
@@ -92,18 +92,18 @@ public class PrintedCard implements ModelInterface {
         this.id = printedCardsId;
     }
 
-    public PrintedCard(Integer printedCardsId, Date printTime,
+    public PrintedCard(Integer printedCardsId, Calendar printTime,
             boolean cardEnabled) {
         this.id = printedCardsId;
         this.printTime = printTime;
         this.enabled = cardEnabled;
     }
 
-    public Date getPrintTime() {
+    public Calendar getPrintTime() {
         return printTime;
     }
 
-    public void setPrintTime(Date printTime) {
+    public void setPrintTime(Calendar printTime) {
         this.printTime = printTime;
     }
 

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

@@ -4,7 +4,7 @@
  */
 package fi.insomnia.bortal.model;
 
-import java.util.Date;
+import java.util.Calendar;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
@@ -41,7 +41,7 @@ public class ReaderEvent implements ModelInterface {
 
     @Column(name = "event_time", nullable = false)
     @Temporal(TemporalType.TIMESTAMP)
-    private Date time;
+    private Calendar time;
 
     @Column(name = "value")
     private String value;
@@ -65,16 +65,16 @@ public class ReaderEvent implements ModelInterface {
         this.id = readerEventsId;
     }
 
-    public ReaderEvent(Integer readerEventsId, Date eventTime) {
+    public ReaderEvent(Integer readerEventsId, Calendar eventTime) {
         this.id = readerEventsId;
         this.time = eventTime;
     }
 
-    public Date getTime() {
+    public Calendar getTime() {
         return time;
     }
 
-    public void setTime(Date eventTime) {
+    public void setTime(Calendar eventTime) {
         this.time = eventTime;
     }
 

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

@@ -4,7 +4,7 @@
  */
 package fi.insomnia.bortal.model;
 
-import java.util.Date;
+import java.util.Calendar;
 import java.util.List;
 
 import javax.persistence.CascadeType;
@@ -56,7 +56,7 @@ public class User implements ModelInterface {
 
     @Column(name = "created", nullable = false)
     @Temporal(TemporalType.TIMESTAMP)
-    private Date created;
+    private Calendar created;
 
     @Column(name = "active", nullable = false)
     private boolean active;
@@ -72,7 +72,7 @@ public class User implements ModelInterface {
 
     @Column(name = "birthday")
     @Temporal(TemporalType.TIMESTAMP)
-    private Date birthday;
+    private Calendar birthday;
 
     @Column(name = "nick")
     private String nick;
@@ -165,7 +165,7 @@ public class User implements ModelInterface {
         this.votes = votes;
     }
 
-    public User(Integer usersId, Date created, boolean active, String lastname,
+    public User(Integer usersId, Calendar created, boolean active, String lastname,
             String firstnames) {
         this.id = usersId;
         this.created = created;
@@ -174,11 +174,11 @@ public class User implements ModelInterface {
         this.firstnames = firstnames;
     }
 
-    public Date getCreated() {
+    public Calendar getCreated() {
         return created;
     }
 
-    public void setCreated(Date created) {
+    public void setCreated(Calendar created) {
         this.created = created;
     }
 
@@ -214,11 +214,11 @@ public class User implements ModelInterface {
         this.firstnames = firstnames;
     }
 
-    public Date getBirthday() {
+    public Calendar getBirthday() {
         return birthday;
     }
 
-    public void setBirthday(Date birthday) {
+    public void setBirthday(Calendar birthday) {
         this.birthday = birthday;
     }
 

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

@@ -4,7 +4,7 @@
  */
 package fi.insomnia.bortal.model;
 
-import java.util.Date;
+import java.util.Calendar;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
@@ -43,7 +43,7 @@ public class Vote implements ModelInterface {
     private Integer score;
     @Column(name = "vote_time", nullable = false)
     @Temporal(TemporalType.TIMESTAMP)
-    private Date time;
+    private Calendar time;
     @JoinColumn(name = "entries_id", referencedColumnName = "entries_id", nullable = false)
     @ManyToOne(optional = false)
     private CompoEntry compoEntry;
@@ -61,7 +61,7 @@ public class Vote implements ModelInterface {
         this.id = votesId;
     }
 
-    public Vote(Integer votesId, Date voteTime) {
+    public Vote(Integer votesId, Calendar voteTime) {
         this.id = votesId;
         this.time = voteTime;
     }
@@ -83,11 +83,11 @@ public class Vote implements ModelInterface {
         this.score = score;
     }
 
-    public Date getTime() {
+    public Calendar getTime() {
         return time;
     }
 
-    public void setTime(Date voteTime) {
+    public void setTime(Calendar voteTime) {
         this.time = voteTime;
     }