From 5805f0a08e69de728bd891d1c09ff32fc297977a Mon Sep 17 00:00:00 2001
From: rsanchez <rsanchez@curisit.net>
Date: Fri, 17 Oct 2014 11:59:03 +0000
Subject: [PATCH] #2021 feature - Added changes on Pack management (in Beta)
---
securis/src/main/java/net/curisit/securis/db/License.java | 4 ++
securis/src/main/resources/static/licenses.html | 4 +-
securis/src/main/java/net/curisit/securis/db/User.java | 1
securis/src/main/resources/static/js/catalogs.json | 14 +++++--
securis/src/main/java/net/curisit/securis/db/Application.java | 17 +++++++-
securis/src/main/java/net/curisit/securis/db/Organization.java | 7 ++-
securis/src/main/java/net/curisit/securis/db/PackStatus.java | 24 ++++++++++++
securis/src/main/resources/static/js/licenses.js | 3 +
securis/src/main/java/net/curisit/securis/db/LicenseType.java | 3 +
securis/src/main/java/net/curisit/securis/db/Pack.java | 11 +++--
securis/src/main/resources/db/schema.sql | 1
11 files changed, 72 insertions(+), 17 deletions(-)
diff --git a/securis/src/main/java/net/curisit/securis/db/Application.java b/securis/src/main/java/net/curisit/securis/db/Application.java
index 71f2c4c..566398a 100644
--- a/securis/src/main/java/net/curisit/securis/db/Application.java
+++ b/securis/src/main/java/net/curisit/securis/db/Application.java
@@ -42,7 +42,12 @@
private String name;
private String description;
+ @Column(name = "license_filename")
+ @JsonProperty("license_filename")
+ private String licenseFilename;
+
@Column(name = "creation_timestamp")
+ @JsonProperty("creation_timestamp")
private Date creationTimestamp;
@JsonIgnore
@@ -54,11 +59,11 @@
@OneToMany(fetch = FetchType.LAZY, mappedBy = "application")
private Set<ApplicationMetadata> metadata;
- public int getId() {
+ public Integer getId() {
return id;
}
- public void setId(int id) {
+ public void setId(Integer id) {
this.id = id;
}
@@ -117,4 +122,12 @@
return (id == null ? 0 : id.hashCode());
}
+
+ public String getLicenseFilename() {
+ return licenseFilename;
+ }
+
+ public void setLicenseFilename(String licenseFilename) {
+ this.licenseFilename = licenseFilename;
+ }
}
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 e6559cb..869574e 100644
--- a/securis/src/main/java/net/curisit/securis/db/License.java
+++ b/securis/src/main/java/net/curisit/securis/db/License.java
@@ -80,15 +80,19 @@
private String licenseData;
@Column(name = "creation_timestamp")
+ @JsonProperty("creation_timestamp")
private Date creationTimestamp;
@Column(name = "modification_timestamp")
+ @JsonProperty("modification_timestamp")
private Date modificationTimestamp;
@Column(name = "last_access_timestamp")
+ @JsonProperty("last_access_timestamp")
private Date lastAccessTimestamp;
@Column(name = "expiration_date")
+ @JsonProperty("expiration_date")
private Date expirationDate;
private String comments;
diff --git a/securis/src/main/java/net/curisit/securis/db/LicenseType.java b/securis/src/main/java/net/curisit/securis/db/LicenseType.java
index b483db2..21d5225 100644
--- a/securis/src/main/java/net/curisit/securis/db/LicenseType.java
+++ b/securis/src/main/java/net/curisit/securis/db/LicenseType.java
@@ -52,6 +52,7 @@
private String description;
@Column(name = "creation_timestamp")
+ @JsonProperty("creation_timestamp")
private Date creationTimestamp;
@JsonIgnore
@@ -70,7 +71,7 @@
this.metadata = metadata;
}
- public int getId() {
+ public Integer getId() {
return id;
}
diff --git a/securis/src/main/java/net/curisit/securis/db/Organization.java b/securis/src/main/java/net/curisit/securis/db/Organization.java
index 4221258..e2d798b 100644
--- a/securis/src/main/java/net/curisit/securis/db/Organization.java
+++ b/securis/src/main/java/net/curisit/securis/db/Organization.java
@@ -50,13 +50,14 @@
@Id
@GeneratedValue
- private int id;
+ private Integer id;
private String code;
private String name;
private String description;
@Column(name = "creation_timestamp")
+ @JsonProperty("creation_timestamp")
private Date creationTimestamp;
@JsonIgnore
@@ -82,11 +83,11 @@
@OneToMany(fetch = FetchType.LAZY, mappedBy = "parentOrganization")
private Set<Organization> childOrganizations;
- public int getId() {
+ public Integer getId() {
return id;
}
- public void setId(int id) {
+ public void setId(Integer id) {
this.id = id;
}
diff --git a/securis/src/main/java/net/curisit/securis/db/Pack.java b/securis/src/main/java/net/curisit/securis/db/Pack.java
index c6f3274..d8f6df9 100644
--- a/securis/src/main/java/net/curisit/securis/db/Pack.java
+++ b/securis/src/main/java/net/curisit/securis/db/Pack.java
@@ -49,6 +49,7 @@
private String comments;
@Column(name = "creation_timestamp")
+ @JsonProperty("creation_timestamp")
private Date creationTimestamp;
@JsonIgnore
@@ -82,7 +83,7 @@
@JsonProperty("end_valid_date")
private Date endValidDate;
- private String status;
+ private PackStatus status;
@Column(name = "license_preactivation")
@JsonProperty("license_preactivation")
@@ -91,11 +92,11 @@
@OneToMany(fetch = FetchType.LAZY, mappedBy = "pack")
private Set<PackMetadata> metadata;
- public int getId() {
+ public Integer getId() {
return id;
}
- public void setId(int id) {
+ public void setId(Integer id) {
this.id = id;
}
@@ -281,11 +282,11 @@
this.metadata = metadata;
}
- public String getStatus() {
+ public PackStatus getStatus() {
return status;
}
- public void setStatus(String status) {
+ public void setStatus(PackStatus status) {
this.status = status;
}
diff --git a/securis/src/main/java/net/curisit/securis/db/PackStatus.java b/securis/src/main/java/net/curisit/securis/db/PackStatus.java
new file mode 100644
index 0000000..110bd36
--- /dev/null
+++ b/securis/src/main/java/net/curisit/securis/db/PackStatus.java
@@ -0,0 +1,24 @@
+package net.curisit.securis.db;
+
+import org.codehaus.jackson.annotate.JsonCreator;
+
+public enum PackStatus {
+ PENDING("PE"), ACTIVE("AC"), ON_HOLD("OH"), EXPIRED("EX"), CANCELLED("CA");
+
+ private final String code;
+ PackStatus(String code ) {
+ this.code = code;
+ }
+ public String getCode() {
+ return code;
+ }
+
+ @JsonCreator
+ public static PackStatus valueFromCode(String code) {
+ for (PackStatus ps : PackStatus.values()) {
+ if (ps.code.equals(code)) return ps;
+ }
+ return null;
+ }
+
+}
diff --git a/securis/src/main/java/net/curisit/securis/db/User.java b/securis/src/main/java/net/curisit/securis/db/User.java
index 87ff665..ea08a53 100644
--- a/securis/src/main/java/net/curisit/securis/db/User.java
+++ b/securis/src/main/java/net/curisit/securis/db/User.java
@@ -62,6 +62,7 @@
private Date modificationTimestamp;
@Column(name = "creation_timestamp")
+ @JsonProperty("creation_timestamp")
private Date creationTimestamp;
private String lang;
diff --git a/securis/src/main/resources/db/schema.sql b/securis/src/main/resources/db/schema.sql
index b249a28..2741405 100644
--- a/securis/src/main/resources/db/schema.sql
+++ b/securis/src/main/resources/db/schema.sql
@@ -22,6 +22,7 @@
CREATE TABLE IF NOT EXISTS application (
id INT NOT NULL auto_increment,
name VARCHAR(45) NOT NULL ,
+ license_filename VARCHAR(100) NOT NULL ,
description VARCHAR(500) NULL ,
creation_timestamp DATETIME NULL ,
PRIMARY KEY (id));
diff --git a/securis/src/main/resources/static/js/catalogs.json b/securis/src/main/resources/static/js/catalogs.json
index 46792f1..c0da309 100644
--- a/securis/src/main/resources/static/js/catalogs.json
+++ b/securis/src/main/resources/static/js/catalogs.json
@@ -22,7 +22,13 @@
"maxlength" : 500,
"multiline" : 2
}, {
- "name" : "creationTimestamp",
+ "name" : "license_filename",
+ "display" : "License filename",
+ "type" : "string",
+ "maxlength" : 100,
+ "mandatory" : true
+ }, {
+ "name" : "creation_timestamp",
"display" : "Creation date",
"autogenerate" : true,
"type" : "date",
@@ -70,7 +76,7 @@
"type" : "select",
"onchange": "updateMetadata"
}, {
- "name" : "creationTimestamp",
+ "name" : "creation_timestamp",
"display" : "Creation date",
"autogenerate" : true,
"type" : "date",
@@ -125,7 +131,7 @@
"resource" : "user",
"type" : "multiselect"
}, {
- "name" : "creationTimestamp",
+ "name" : "creation_timestamp",
"display" : "Creation date",
"autogenerate" : true,
"type" : "date",
@@ -181,7 +187,7 @@
"type" : "date",
"readOnly" : true
}, {
- "name" : "creationTimestamp",
+ "name" : "creation_timestamp",
"display" : "Creation date",
"autogenerate" : true,
"type" : "date",
diff --git a/securis/src/main/resources/static/js/licenses.js b/securis/src/main/resources/static/js/licenses.js
index a2e3a20..e0624fd 100644
--- a/securis/src/main/resources/static/js/licenses.js
+++ b/securis/src/main/resources/static/js/licenses.js
@@ -112,6 +112,9 @@
$scope.mandatory = {
code: true,
num_licenses: true,
+ init_valid_date: true,
+ end_valid_date: true,
+ status: true,
organization_id: true,
license_type_id: true
}
diff --git a/securis/src/main/resources/static/licenses.html b/securis/src/main/resources/static/licenses.html
index 7d40fa9..a8ed791 100644
--- a/securis/src/main/resources/static/licenses.html
+++ b/securis/src/main/resources/static/licenses.html
@@ -198,7 +198,7 @@
<label i18n class="col-md-3 control-label">Creation date</label>
<div class="col-md-8">
<p class="form-control-static"
- ng-bind="pack.creationTimestamp | date:'medium'"></p>
+ ng-bind="pack.creation_timestamp | date:'medium'"></p>
</div>
</div>
@@ -476,7 +476,7 @@
<label class="col-md-3 control-label" i18n>Creation date</label>
<div class="col-md-8">
<p class="form-control-static"
- ng-bind="license.creationTimestamp | date:'medium'"></p>
+ ng-bind="license.creation_timestamp | date:'medium'"></p>
</div>
</div>
--
Gitblit v1.3.2