#395 feature - Added license history entity and new angular directive to lo...

Roberto Sánchez

2014-01-26 6d8aff7b3657332020ef215eb1b2fc16017e4cc8

 securis/src/main/java/net/curisit/securis/db/License.java
..
..
@@ -2,15 +2,18 @@
2
2
 
3
3
 import java.io.Serializable;
4
4
 import java.util.Date;
5
+import java.util.List;
5
6
 
6
7
 import javax.persistence.Column;
7
8
 import javax.persistence.Entity;
9
+import javax.persistence.FetchType;
8
10
 import javax.persistence.GeneratedValue;
9
11
 import javax.persistence.Id;
10
12
 import javax.persistence.JoinColumn;
11
13
 import javax.persistence.ManyToOne;
12
14
 import javax.persistence.NamedQueries;
13
15
 import javax.persistence.NamedQuery;
16
+import javax.persistence.OneToMany;
14
17
 import javax.persistence.Table;
15
18
 
16
19
 import org.codehaus.jackson.annotate.JsonAutoDetect;
..
..
@@ -77,19 +80,13 @@
77
80
 	@Column(name = "modification_timestamp")
78
81
 	private Date modificationTimestamp;
79
82
 
80
-	@Column(name = "activation_timestamp")
81
-	private Date activationTimestamp;
82
-
83
-	@Column(name = "cancelation_timestamp")
84
-	private Date cancelationTimestamp;
85
-
86
-	@Column(name = "send_timestamp")
87
-	private Date sendTimestamp;
88
-
89
83
 	@Column(name = "last_access_timestamp")
90
84
 	private Date lastAccessTimestamp;
91
85
 
92
86
 	private String comments;
87
+
88
+	@OneToMany(fetch = FetchType.LAZY, mappedBy = "license")
89
+	private List<LicenseHistory> history;
93
90
 
94
91
 	public int getId() {
95
92
 		return id;
..
..
@@ -209,22 +206,6 @@
209
206
 		this.email = email;
210
207
 	}
211
208
 
212
-	public Date getActivationTimestamp() {
213
-		return activationTimestamp;
214
-	}
215
-
216
-	public void setActivationTimestamp(Date activationTimestamp) {
217
-		this.activationTimestamp = activationTimestamp;
218
-	}
219
-
220
-	public Date getSendTimestamp() {
221
-		return sendTimestamp;
222
-	}
223
-
224
-	public void setSendTimestamp(Date sendTimestamp) {
225
-		this.sendTimestamp = sendTimestamp;
226
-	}
227
-
228
209
 	public void setId(int id) {
229
210
 		this.id = id;
230
211
 	}
..
..
@@ -235,14 +216,6 @@
235
216
 
236
217
 	public void setCanceledBy(User canceledBy) {
237
218
 		this.canceledBy = canceledBy;
238
-	}
239
-
240
-	public Date getCancelationTimestamp() {
241
-		return cancelationTimestamp;
242
-	}
243
-
244
-	public void setCancelationTimestamp(Date cancelationTimestamp) {
245
-		this.cancelationTimestamp = cancelationTimestamp;
246
219
 	}
247
220
 
248
221
 	public Date getLastAccessTimestamp() {
..
..
@@ -277,6 +250,14 @@
277
250
 		this.comments = comments;
278
251
 	}
279
252
 
253
+	public List<LicenseHistory> getHistory() {
254
+		return history;
255
+	}
256
+
257
+	public void setHistory(List<LicenseHistory> history) {
258
+		this.history = history;
259
+	}
260
+
280
261
 	public static class Status {
281
262
 		public static final int CREATED = 0;
282
263
 		public static final int SENT = 1;