From 66a6828123533a35ca5e18b9c84aeedc5838c556 Mon Sep 17 00:00:00 2001
From: Mirco Nasuti <mirco.nasuti@chuv.ch>
Date: Thu, 10 Mar 2016 15:47:52 +0100
Subject: [PATCH] add variables descriptions
---
pom.xml | 54 +++++++++----------
src/main/java/org/hbp/mip/model/Variable.java | 11 ++++
src/test/db | 2 +-
3 files changed, 39 insertions(+), 28 deletions(-)
diff --git a/pom.xml b/pom.xml
index c1b82d22f..9217a4642 100644
--- a/pom.xml
+++ b/pom.xml
@@ -17,35 +17,35 @@
<version>1.3.2.RELEASE</version>
<relativePath /> <!-- lookup parent from repository -->
</parent>
- <profiles>
- <profile>
- <id>test</id>
- <properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <java.version>1.8</java.version>
- <connection.driver_class>org.h2.Driver</connection.driver_class>
- <connection.url>jdbc:h2:mem:test</connection.url>
- <connection.username>root</connection.username>
- <connection.password>root</connection.password>
- <hibernate.dialect>org.hibernate.dialect.H2Dialect</hibernate.dialect>
- <schema.deploy>true</schema.deploy>
+ <profiles>
+ <profile>
+ <id>test</id>
+ <properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <java.version>1.8</java.version>
+ <connection.driver_class>org.h2.Driver</connection.driver_class>
+ <connection.url>jdbc:h2:mem:test</connection.url>
+ <connection.username>root</connection.username>
+ <connection.password>root</connection.password>
+ <hibernate.dialect>org.hibernate.dialect.H2Dialect</hibernate.dialect>
+ <schema.deploy>true</schema.deploy>
<frontend.redirect>http://frontend/#/home</frontend.redirect>
- </properties>
- </profile>
- <profile>
- <id>prod</id>
- <properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <java.version>1.8</java.version>
- <connection.driver_class>org.postgresql.Driver</connection.driver_class>
- <connection.url>jdbc:postgresql://hbpmdw1.chuv.ch:31432/portal</connection.url>
- <connection.username>portal</connection.username>
- <connection.password>iaezXODVLb1e70I</connection.password>
- <hibernate.dialect>org.hibernate.dialect.PostgreSQL82Dialect</hibernate.dialect>
- <schema.deploy>false</schema.deploy>
+ </properties>
+ </profile>
+ <profile>
+ <id>prod</id>
+ <properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <java.version>1.8</java.version>
+ <connection.driver_class>org.postgresql.Driver</connection.driver_class>
+ <connection.url>jdbc:postgresql://hbpmdw1.chuv.ch:31432/portal</connection.url>
+ <connection.username>portal</connection.username>
+ <connection.password>iaezXODVLb1e70I</connection.password>
+ <hibernate.dialect>org.hibernate.dialect.PostgreSQL82Dialect</hibernate.dialect>
+ <schema.deploy>false</schema.deploy>
<frontend.redirect>https://mip.humanbrainproject.eu/#/home</frontend.redirect>
- </properties>
- </profile>
+ </properties>
+ </profile>
<profile>
<id>dev</id>
<properties>
diff --git a/src/main/java/org/hbp/mip/model/Variable.java b/src/main/java/org/hbp/mip/model/Variable.java
index 7bf380b36..6d56a4921 100644
--- a/src/main/java/org/hbp/mip/model/Variable.java
+++ b/src/main/java/org/hbp/mip/model/Variable.java
@@ -52,6 +52,8 @@ public class Variable {
@ManyToMany(fetch = FetchType.EAGER, mappedBy = "variables")
private List<Query> queries = new LinkedList<>();
+ private String description = null;
+
public Variable() {
}
@@ -186,4 +188,13 @@ public class Variable {
this.queries = queries;
}
+
+ public String getDescription() {
+ return description;
+ }
+
+ public void setDescription(String description) {
+ this.description = description;
+ }
+
}
diff --git a/src/test/db b/src/test/db
index 862cdf17e..b424b9d34 160000
--- a/src/test/db
+++ b/src/test/db
@@ -1 +1 @@
-Subproject commit 862cdf17ea38cc4abf934450447045e37e5f89a9
+Subproject commit b424b9d34d711dd90abe073a947f5069b211a261
--
GitLab