#2021 feature - Added changes on Pack management (in Beta)

rsanchez

2014-10-17 5805f0a08e69de728bd891d1c09ff32fc297977a

#2021 feature - Added changes on Pack management (in Beta) 

 securis/src/main/java/net/curisit/securis/db/Application.java
..
..
@@ -42,7 +42,12 @@
42
42
     private String name;
43
43
     private String description;
44
44
 
45
+    @Column(name = "license_filename")
46
+    @JsonProperty("license_filename")
47
+    private String licenseFilename;
48
+
45
49
     @Column(name = "creation_timestamp")
50
+    @JsonProperty("creation_timestamp")
46
51
     private Date creationTimestamp;
47
52
 
48
53
     @JsonIgnore
..
..
@@ -54,11 +59,11 @@
54
59
     @OneToMany(fetch = FetchType.LAZY, mappedBy = "application")
55
60
     private Set<ApplicationMetadata> metadata;
56
61
 
57
-    public int getId() {
62
+    public Integer getId() {
58
63
         return id;
59
64
     }
60
65
 
61
-    public void setId(int id) {
66
+    public void setId(Integer id) {
62
67
         this.id = id;
63
68
     }
64
69
 
..
..
@@ -117,4 +122,12 @@
117
122
      
118
123
         return (id == null ? 0 : id.hashCode());
119
124
     }
125
+
126
+    public String getLicenseFilename() {
127
+        return licenseFilename;
128
+    }
129
+
130
+    public void setLicenseFilename(String licenseFilename) {
131
+        this.licenseFilename = licenseFilename;
132
+    }
120
133
 }
 securis/src/main/java/net/curisit/securis/db/License.java
..
..
@@ -80,15 +80,19 @@
80
80
     private String licenseData;
81
81
 
82
82
     @Column(name = "creation_timestamp")
83
+    @JsonProperty("creation_timestamp")
83
84
     private Date creationTimestamp;
84
85
 
85
86
     @Column(name = "modification_timestamp")
87
+    @JsonProperty("modification_timestamp")
86
88
     private Date modificationTimestamp;
87
89
 
88
90
     @Column(name = "last_access_timestamp")
91
+    @JsonProperty("last_access_timestamp")
89
92
     private Date lastAccessTimestamp;
90
93
 
91
94
     @Column(name = "expiration_date")
95
+    @JsonProperty("expiration_date")
92
96
     private Date expirationDate;
93
97
 
94
98
     private String comments;
 securis/src/main/java/net/curisit/securis/db/LicenseType.java
..
..
@@ -52,6 +52,7 @@
52
52
     private String description;
53
53
 
54
54
     @Column(name = "creation_timestamp")
55
+    @JsonProperty("creation_timestamp")
55
56
     private Date creationTimestamp;
56
57
 
57
58
     @JsonIgnore
..
..
@@ -70,7 +71,7 @@
70
71
         this.metadata = metadata;
71
72
     }
72
73
 
73
-    public int getId() {
74
+    public Integer getId() {
74
75
         return id;
75
76
     }
76
77
 
 securis/src/main/java/net/curisit/securis/db/Organization.java
..
..
@@ -50,13 +50,14 @@
50
50
 
51
51
     @Id
52
52
     @GeneratedValue
53
-    private int id;
53
+    private Integer id;
54
54
 
55
55
     private String code;
56
56
     private String name;
57
57
     private String description;
58
58
 
59
59
     @Column(name = "creation_timestamp")
60
+    @JsonProperty("creation_timestamp")
60
61
     private Date creationTimestamp;
61
62
 
62
63
     @JsonIgnore
..
..
@@ -82,11 +83,11 @@
82
83
     @OneToMany(fetch = FetchType.LAZY, mappedBy = "parentOrganization")
83
84
     private Set<Organization> childOrganizations;
84
85
 
85
-    public int getId() {
86
+    public Integer getId() {
86
87
         return id;
87
88
     }
88
89
 
89
-    public void setId(int id) {
90
+    public void setId(Integer id) {
90
91
         this.id = id;
91
92
     }
92
93
 
 securis/src/main/java/net/curisit/securis/db/Pack.java
..
..
@@ -49,6 +49,7 @@
49
49
     private String comments;
50
50
 
51
51
     @Column(name = "creation_timestamp")
52
+    @JsonProperty("creation_timestamp")
52
53
     private Date creationTimestamp;
53
54
 
54
55
     @JsonIgnore
..
..
@@ -82,7 +83,7 @@
82
83
     @JsonProperty("end_valid_date")
83
84
     private Date endValidDate;
84
85
 
85
-    private String status;
86
+    private PackStatus status;
86
87
 
87
88
     @Column(name = "license_preactivation")
88
89
     @JsonProperty("license_preactivation")
..
..
@@ -91,11 +92,11 @@
91
92
     @OneToMany(fetch = FetchType.LAZY, mappedBy = "pack")
92
93
     private Set<PackMetadata> metadata;
93
94
 
94
-    public int getId() {
95
+    public Integer getId() {
95
96
         return id;
96
97
     }
97
98
 
98
-    public void setId(int id) {
99
+    public void setId(Integer id) {
99
100
         this.id = id;
100
101
     }
101
102
 
..
..
@@ -281,11 +282,11 @@
281
282
         this.metadata = metadata;
282
283
     }
283
284
 
284
-    public String getStatus() {
285
+    public PackStatus getStatus() {
285
286
         return status;
286
287
     }
287
288
 
288
-    public void setStatus(String status) {
289
+    public void setStatus(PackStatus status) {
289
290
         this.status = status;
290
291
     }
291
292
 
 securis/src/main/java/net/curisit/securis/db/PackStatus.java
..
..
@@ -0,0 +1,24 @@
1
+package net.curisit.securis.db;
2
+
3
+import org.codehaus.jackson.annotate.JsonCreator;
4
+
5
+public enum PackStatus {
6
+    PENDING("PE"), ACTIVE("AC"),  ON_HOLD("OH"),  EXPIRED("EX"),  CANCELLED("CA");
7
+    
8
+    private final String code;
9
+    PackStatus(String code ) {
10
+        this.code = code;
11
+    }
12
+    public String getCode() {
13
+        return code;
14
+    }
15
+    
16
+    @JsonCreator
17
+    public static PackStatus valueFromCode(String code) {
18
+        for (PackStatus ps : PackStatus.values()) {
19
+            if (ps.code.equals(code)) return ps;
20
+        }
21
+        return null;
22
+    }
23
+
24
+}
 securis/src/main/java/net/curisit/securis/db/User.java
..
..
@@ -62,6 +62,7 @@
62
62
     private Date modificationTimestamp;
63
63
 
64
64
     @Column(name = "creation_timestamp")
65
+    @JsonProperty("creation_timestamp")
65
66
     private Date creationTimestamp;
66
67
 
67
68
     private String lang;
 securis/src/main/resources/db/schema.sql
..
..
@@ -22,6 +22,7 @@
22
22
 CREATE TABLE IF NOT EXISTS application (
23
23
   id INT NOT NULL auto_increment,
24
24
   name VARCHAR(45) NOT NULL ,
25
+  license_filename VARCHAR(100) NOT NULL ,
25
26
   description VARCHAR(500) NULL ,
26
27
   creation_timestamp DATETIME NULL ,  
27
28
   PRIMARY KEY (id));
 securis/src/main/resources/static/js/catalogs.json
..
..
@@ -22,7 +22,13 @@
22
22
 		"maxlength" : 500,
23
23
 		"multiline" : 2
24
24
 	}, {
25
-		"name" : "creationTimestamp",
25
+		"name" : "license_filename",
26
+		"display" : "License filename",
27
+		"type" : "string",
28
+		"maxlength" : 100,
29
+		"mandatory" : true
30
+	}, {
31
+		"name" : "creation_timestamp",
26
32
 		"display" : "Creation date",
27
33
 		"autogenerate" : true,
28
34
 		"type" : "date",
..
..
@@ -70,7 +76,7 @@
70
76
 		"type" : "select",
71
77
 		"onchange": "updateMetadata"
72
78
 	}, {
73
-		"name" : "creationTimestamp",
79
+		"name" : "creation_timestamp",
74
80
 		"display" : "Creation date",
75
81
 		"autogenerate" : true,
76
82
 		"type" : "date",
..
..
@@ -125,7 +131,7 @@
125
131
 		"resource" : "user",
126
132
 		"type" : "multiselect"
127
133
 	}, {
128
-		"name" : "creationTimestamp",
134
+		"name" : "creation_timestamp",
129
135
 		"display" : "Creation date",
130
136
 		"autogenerate" : true,
131
137
 		"type" : "date",
..
..
@@ -181,7 +187,7 @@
181
187
 		"type" : "date",
182
188
 		"readOnly" : true
183
189
 	}, {
184
-		"name" : "creationTimestamp",
190
+		"name" : "creation_timestamp",
185
191
 		"display" : "Creation date",
186
192
 		"autogenerate" : true,
187
193
 		"type" : "date",
 securis/src/main/resources/static/js/licenses.js
..
..
@@ -112,6 +112,9 @@
112
112
 				$scope.mandatory = {
113
113
 						code: true,
114
114
 						num_licenses: true,
115
+						init_valid_date: true,
116
+						end_valid_date: true,
117
+						status: true,
115
118
 						organization_id: true,
116
119
 						license_type_id: true
117
120
 				}
 securis/src/main/resources/static/licenses.html
..
..
@@ -198,7 +198,7 @@
198
198
 					<label i18n class="col-md-3 control-label">Creation date</label>
199
199
 					<div class="col-md-8">
200
200
 						<p class="form-control-static"
201
-							ng-bind="pack.creationTimestamp | date:'medium'"></p>
201
+							ng-bind="pack.creation_timestamp | date:'medium'"></p>
202
202
 					</div>
203
203
 				</div>
204
204
 
..
..
@@ -476,7 +476,7 @@
476
476
 					<label class="col-md-3 control-label" i18n>Creation date</label>
477
477
 					<div class="col-md-8">
478
478
 						<p class="form-control-static"
479
-							ng-bind="license.creationTimestamp | date:'medium'"></p>
479
+							ng-bind="license.creation_timestamp | date:'medium'"></p>
480
480
 					</div>
481
481
 				</div>
482
482