From 6d8aff7b3657332020ef215eb1b2fc16017e4cc8 Mon Sep 17 00:00:00 2001
From: Roberto Sánchez <roberto.sanchez@curisit.net>
Date: Sun, 26 Jan 2014 13:34:03 +0000
Subject: [PATCH] #395 feature - Added license history entity and new angular directive to load file content

---
 securis/src/main/java/net/curisit/securis/db/License.java |   47 ++++++++++++++---------------------------------
 1 files changed, 14 insertions(+), 33 deletions(-)

diff --git a/securis/src/main/java/net/curisit/securis/db/License.java b/securis/src/main/java/net/curisit/securis/db/License.java
index f683161..3bd60b0 100644
--- a/securis/src/main/java/net/curisit/securis/db/License.java
+++ b/securis/src/main/java/net/curisit/securis/db/License.java
@@ -2,15 +2,18 @@
 
 import java.io.Serializable;
 import java.util.Date;
+import java.util.List;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
+import javax.persistence.FetchType;
 import javax.persistence.GeneratedValue;
 import javax.persistence.Id;
 import javax.persistence.JoinColumn;
 import javax.persistence.ManyToOne;
 import javax.persistence.NamedQueries;
 import javax.persistence.NamedQuery;
+import javax.persistence.OneToMany;
 import javax.persistence.Table;
 
 import org.codehaus.jackson.annotate.JsonAutoDetect;
@@ -77,19 +80,13 @@
 	@Column(name = "modification_timestamp")
 	private Date modificationTimestamp;
 
-	@Column(name = "activation_timestamp")
-	private Date activationTimestamp;
-
-	@Column(name = "cancelation_timestamp")
-	private Date cancelationTimestamp;
-
-	@Column(name = "send_timestamp")
-	private Date sendTimestamp;
-
 	@Column(name = "last_access_timestamp")
 	private Date lastAccessTimestamp;
 
 	private String comments;
+
+	@OneToMany(fetch = FetchType.LAZY, mappedBy = "license")
+	private List<LicenseHistory> history;
 
 	public int getId() {
 		return id;
@@ -209,22 +206,6 @@
 		this.email = email;
 	}
 
-	public Date getActivationTimestamp() {
-		return activationTimestamp;
-	}
-
-	public void setActivationTimestamp(Date activationTimestamp) {
-		this.activationTimestamp = activationTimestamp;
-	}
-
-	public Date getSendTimestamp() {
-		return sendTimestamp;
-	}
-
-	public void setSendTimestamp(Date sendTimestamp) {
-		this.sendTimestamp = sendTimestamp;
-	}
-
 	public void setId(int id) {
 		this.id = id;
 	}
@@ -235,14 +216,6 @@
 
 	public void setCanceledBy(User canceledBy) {
 		this.canceledBy = canceledBy;
-	}
-
-	public Date getCancelationTimestamp() {
-		return cancelationTimestamp;
-	}
-
-	public void setCancelationTimestamp(Date cancelationTimestamp) {
-		this.cancelationTimestamp = cancelationTimestamp;
 	}
 
 	public Date getLastAccessTimestamp() {
@@ -277,6 +250,14 @@
 		this.comments = comments;
 	}
 
+	public List<LicenseHistory> getHistory() {
+		return history;
+	}
+
+	public void setHistory(List<LicenseHistory> history) {
+		this.history = history;
+	}
+
 	public static class Status {
 		public static final int CREATED = 0;
 		public static final int SENT = 1;

--
Gitblit v1.3.2