From 8590c87f60ff18c8dc4dbd1e1a8a1a705bad115f Mon Sep 17 00:00:00 2001
From: Piotr Gawron <piotr.gawron@uni.lu>
Date: Thu, 5 Jan 2017 14:06:24 +0100
Subject: [PATCH] fix on showing only not removed comments
---
frontend-js/src/main/js/ServerConnector.js | 2 +-
frontend-js/src/main/js/map/data/Comment.js | 3 +-
.../main/js/map/window/AbstractInfoWindow.js | 2 +-
.../src/test/js/map/data/Comment-test.js | 32 +++++++++++++++++++
...icon&projectId=sample&token=MOCK_TOKEN_ID& | 1 -
...oved&projectId=sample&token=MOCK_TOKEN_ID& | 1 +
6 files changed, 37 insertions(+), 4 deletions(-)
create mode 100644 frontend-js/src/test/js/map/data/Comment-test.js
delete mode 100644 frontend-js/testFiles/apiCalls/comment/getCommentList/columns=id,elementId,modelId,type,icon&projectId=sample&token=MOCK_TOKEN_ID&
create mode 100644 frontend-js/testFiles/apiCalls/comment/getCommentList/columns=id,elementId,modelId,type,icon,removed&projectId=sample&token=MOCK_TOKEN_ID&
diff --git a/frontend-js/src/main/js/ServerConnector.js b/frontend-js/src/main/js/ServerConnector.js
index 5fbc10dcbd..81f7438b05 100644
--- a/frontend-js/src/main/js/ServerConnector.js
+++ b/frontend-js/src/main/js/ServerConnector.js
@@ -1098,7 +1098,7 @@ ServerConnector.getAliases = function(aliasIds, projectId, columns) {
};
ServerConnector.getLightComments = function(params) {
- params.columns = [ "id","elementId", "modelId", "type", "icon" ];
+ params.columns = [ "id","elementId", "modelId", "type", "icon", "removed" ];
return this.getComments(params);
};
diff --git a/frontend-js/src/main/js/map/data/Comment.js b/frontend-js/src/main/js/map/data/Comment.js
index ee1a7c1102..ff11aedae5 100644
--- a/frontend-js/src/main/js/map/data/Comment.js
+++ b/frontend-js/src/main/js/map/data/Comment.js
@@ -10,10 +10,11 @@ function Comment(javaObject) {
icon : javaObject.icon,
}));
this.setId(javaObject.id);
+ this.setRemoved(javaObject.removed);
+
if (javaObject.title !== undefined) {
this.setPinned(javaObject.pinned);
this.setCoordinates(javaObject.coord);
- this.setRemoved(javaObject.removed);
this.setTitle(javaObject.title);
this.setContent(javaObject.content);
}
diff --git a/frontend-js/src/main/js/map/window/AbstractInfoWindow.js b/frontend-js/src/main/js/map/window/AbstractInfoWindow.js
index a9a527780f..6ce121a8fc 100644
--- a/frontend-js/src/main/js/map/window/AbstractInfoWindow.js
+++ b/frontend-js/src/main/js/map/window/AbstractInfoWindow.js
@@ -238,7 +238,7 @@ AbstractInfoWindow.prototype._createCommentInfoDiv = function(overlay, data) {
for (var i = 0; i < data.length; i++) {
var comment = data[i];
if (comment instanceof Comment) {
- if (!comment.isRemoved() && comment.isPinned()) {
+ if (!comment.isRemoved()) {
result.appendChild(document.createElement("hr"));
var commentId = document.createElement("div");
commentId.innerHTML = '#' + comment.getId();
diff --git a/frontend-js/src/test/js/map/data/Comment-test.js b/frontend-js/src/test/js/map/data/Comment-test.js
new file mode 100644
index 0000000000..0c99ebc12d
--- /dev/null
+++ b/frontend-js/src/test/js/map/data/Comment-test.js
@@ -0,0 +1,32 @@
+"use strict";
+
+var Comment = require('../../../../main/js/map/data/Comment');
+var chai = require('chai');
+var assert = chai.assert;
+var logger = require('../../logger');
+
+describe('Comment', function() {
+ beforeEach(function() {
+ logger.flushBuffer();
+ });
+
+ it("constructor", function() {
+ var comment = new Comment({
+ elementId : 1,
+ type : "ALIAS",
+ modelId : 3,
+ icon : "icons/comment.png",
+ id : 4,
+ pinned : true,
+ coord : {
+ x : 321.5,
+ y : 289.0
+ },
+ removed : false,
+ title : "title fo comment: ",
+ content : "content of the comment # "
+ });
+ assert.ok(comment.isPinned());
+ assert.notOk(comment.isRemoved());
+ });
+});
diff --git a/frontend-js/testFiles/apiCalls/comment/getCommentList/columns=id,elementId,modelId,type,icon&projectId=sample&token=MOCK_TOKEN_ID& b/frontend-js/testFiles/apiCalls/comment/getCommentList/columns=id,elementId,modelId,type,icon&projectId=sample&token=MOCK_TOKEN_ID&
deleted file mode 100644
index fa112f90d2..0000000000
--- a/frontend-js/testFiles/apiCalls/comment/getCommentList/columns=id,elementId,modelId,type,icon&projectId=sample&token=MOCK_TOKEN_ID&
+++ /dev/null
@@ -1 +0,0 @@
-[{"elementId":"Point2D.Double[241.01, 372.35]","modelId":15781,"icon":"icons/comment.png","id":4506,"type":"POINT"},{"elementId":"Point2D.Double[643.96, 144.09]","modelId":15781,"icon":"icons/comment.png","id":4507,"type":"POINT"}]
\ No newline at end of file
diff --git a/frontend-js/testFiles/apiCalls/comment/getCommentList/columns=id,elementId,modelId,type,icon,removed&projectId=sample&token=MOCK_TOKEN_ID& b/frontend-js/testFiles/apiCalls/comment/getCommentList/columns=id,elementId,modelId,type,icon,removed&projectId=sample&token=MOCK_TOKEN_ID&
new file mode 100644
index 0000000000..41b5f0f752
--- /dev/null
+++ b/frontend-js/testFiles/apiCalls/comment/getCommentList/columns=id,elementId,modelId,type,icon,removed&projectId=sample&token=MOCK_TOKEN_ID&
@@ -0,0 +1 @@
+[{"elementId":"Point2D.Double[241.01, 372.35]","modelId":15781,"icon":"icons/comment.png","id":4506,"type":"POINT","removed":false},{"elementId":"Point2D.Double[643.96, 144.09]","modelId":15781,"icon":"icons/comment.png","id":4507,"type":"POINT","removed":false}]
\ No newline at end of file
--
GitLab