From 554262b6caa16b241b5b11a07d7a4e93ad36ab10 Mon Sep 17 00:00:00 2001
From: Piotr Gawron <piotr.gawron@uni.lu>
Date: Tue, 8 Aug 2017 17:35:20 +0200
Subject: [PATCH] project doesn't contain description - it's model property
---
frontend-js/.idea/frontend-js.iml | 1 +
.../main/js/gui/leftPanel/ProjectInfoPanel.js | 14 --------------
frontend-js/src/main/js/map/data/Project.js | 19 -------------------
.../src/test/js/map/data/Project-test.js | 2 --
.../java/lcsb/mapviewer/model/Project.java | 4 ++--
5 files changed, 3 insertions(+), 37 deletions(-)
diff --git a/frontend-js/.idea/frontend-js.iml b/frontend-js/.idea/frontend-js.iml
index 3bba33a181..832c99755b 100644
--- a/frontend-js/.idea/frontend-js.iml
+++ b/frontend-js/.idea/frontend-js.iml
@@ -10,5 +10,6 @@
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" name="chai-DefinitelyTyped" level="application" />
+ <orderEntry type="library" name="js-cookie-DefinitelyTyped" level="application" />
</component>
</module>
\ No newline at end of file
diff --git a/frontend-js/src/main/js/gui/leftPanel/ProjectInfoPanel.js b/frontend-js/src/main/js/gui/leftPanel/ProjectInfoPanel.js
index 5ff245cadc..7de49eae84 100644
--- a/frontend-js/src/main/js/gui/leftPanel/ProjectInfoPanel.js
+++ b/frontend-js/src/main/js/gui/leftPanel/ProjectInfoPanel.js
@@ -81,18 +81,6 @@ ProjectInfoPanel.prototype._createInfoPanelGui = function () {
this.setControlElement(PanelControlElementType.INFO_PROJECT_VERSION_TEXT, projectVersionText);
dataTab.appendChild(guiUtils.createTableRow([projectVersionLabel, projectVersionText]));
- var projectDescriptionLabel = Functions.createElement({
- type: "div",
- content: "Description:"
- });
- var projectDescriptionText = Functions.createElement({
- type: "div",
- style: "width:100%",
- name: "projectDescriptionText"
- });
- this.setControlElement(PanelControlElementType.INFO_PROJECT_DESCRIOPTION_TEXT, projectDescriptionText);
- dataTab.appendChild(guiUtils.createTableRow([projectDescriptionLabel, projectDescriptionText]));
-
infoTitle = Functions.createElement({
type: "h4",
content: "Data:"
@@ -221,13 +209,11 @@ ProjectInfoPanel.prototype.refresh = function () {
var projectNameText = self.getControlElement(PanelControlElementType.INFO_PROJECT_NAME_TEXT);
var projectVersionText = self.getControlElement(PanelControlElementType.INFO_PROJECT_VERSION_TEXT);
- var projectDescriptionText = self.getControlElement(PanelControlElementType.INFO_PROJECT_DESCRIOPTION_TEXT);
var projectPublicationsText = self.getControlElement(PanelControlElementType.INFO_PROJECT_PUBLICATIONS_TEXT);
return ServerConnector.getProject().then(function (project) {
projectNameText.innerHTML = project.getName();
projectVersionText.innerHTML = project.getVersion();
- projectDescriptionText.innerHTML = project.getDescription();
return ServerConnector.getProjectStatistics();
}).then(function (statistics) {
projectPublicationsText.innerHTML = statistics.getPublicationCount();
diff --git a/frontend-js/src/main/js/map/data/Project.js b/frontend-js/src/main/js/map/data/Project.js
index 85c8b64da1..7bf2347ea6 100644
--- a/frontend-js/src/main/js/map/data/Project.js
+++ b/frontend-js/src/main/js/map/data/Project.js
@@ -32,12 +32,10 @@ Project.prototype.loadFromData = function(data) {
this.setProjectId(data.getProjectId());
this.setVersion(data.getVersion());
this.setName(data.getName());
- this.setDescription(data.getDescription());
this.setOverviewImages(data.getOverviewImages());
this.setTopOverviewImage(data.getTopOverviewImage());
this.setDisease(data.getDisease());
this.setOrganism(data.getOrganism());
- this.setPublicationCount(data.getPublicationCount());
this.setModel(new Model(data.getModel()));
@@ -48,12 +46,10 @@ Project.prototype.loadFromData = function(data) {
this.setProjectId(data.projectId);
this.setVersion(data.version);
this.setName(data.name);
- this.setDescription(data.description);
this.setOverviewImages(data.overviewImageViews);
this.setTopOverviewImage(data.topOverviewImage);
this.setDisease(data.disease);
this.setOrganism(data.organism);
- this.setPublicationCount(data.publicationCount);
this.callListeners("onreload");
}
@@ -110,13 +106,6 @@ Project.prototype.setTopOverviewImage = function(topOverviewImage) {
this._topOverviewImage = topOverviewImage;
};
-Project.prototype.getDescription = function() {
- return this._description;
-};
-Project.prototype.setDescription = function(description) {
- this._description = description;
-};
-
Project.prototype.getDisease = function() {
return this._disease;
};
@@ -139,12 +128,4 @@ Project.prototype.setOrganism = function(organism) {
}
};
-Project.prototype.getPublicationCount = function() {
- return this._publicationCount;
-};
-
-Project.prototype.setPublicationCount = function(publicationCount) {
- this._publicationCount = parseInt(publicationCount);
-};
-
module.exports = Project;
diff --git a/frontend-js/src/test/js/map/data/Project-test.js b/frontend-js/src/test/js/map/data/Project-test.js
index e2857d6e12..7d9b9b0481 100644
--- a/frontend-js/src/test/js/map/data/Project-test.js
+++ b/frontend-js/src/test/js/map/data/Project-test.js
@@ -18,7 +18,6 @@ describe('Project', function() {
assert.equal(project.getId(), 14898);
assert.equal(project.getName(), "UNKNOWN DISEASE MAP");
assert.equal(project.getProjectId(), "sample");
- assert.equal(project.getDescription(), "");
assert.deepEqual(project.getOverviewImages(), []);
assert.equal(logger.getWarnings().length, 0);
@@ -35,7 +34,6 @@ describe('Project', function() {
assert.equal(project.getId(), 14898);
assert.equal(project.getName(), "UNKNOWN DISEASE MAP");
assert.equal(project.getProjectId(), "sample");
- assert.equal(project.getDescription(), "");
assert.deepEqual(project.getOverviewImages(), []);
assert.equal(logger.getWarnings().length, 0);
diff --git a/model/src/main/java/lcsb/mapviewer/model/Project.java b/model/src/main/java/lcsb/mapviewer/model/Project.java
index c88cd2ffc2..556ee98b37 100644
--- a/model/src/main/java/lcsb/mapviewer/model/Project.java
+++ b/model/src/main/java/lcsb/mapviewer/model/Project.java
@@ -46,8 +46,8 @@ public class Project implements Serializable {
private static Logger logger = Logger.getLogger(Project.class);
/**
- *
- */
+ *
+ */
private static final long serialVersionUID = 1L;
/**
--
GitLab