From 1def0649cf37b7813a7c68d458bf88da9ab47e5b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sven=20K=C3=A4stle?= <sven.kaestle@gmx.de>
Date: Fri, 20 Jul 2018 19:20:48 +0200
Subject: [PATCH] feat: Add edit annotation websocket support
---
.../annotation/model/AnnotationMessage.java | 5 +-
.../main/webapp/assets/js/annotationScript.js | 51 ++++++++++++++++++-
.../webapp/assets/js/annotationWebsocket.js | 7 ++-
3 files changed, 59 insertions(+), 4 deletions(-)
diff --git a/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/annotation/model/AnnotationMessage.java b/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/annotation/model/AnnotationMessage.java
index 71f2fa11..60d895b6 100644
--- a/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/annotation/model/AnnotationMessage.java
+++ b/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/annotation/model/AnnotationMessage.java
@@ -8,8 +8,9 @@ public class AnnotationMessage {
private String annotationId;
public enum AnnotationMessageType {
- GET,
- DELETE
+ CREATE,
+ DELETE,
+ EDIT
}
// methods
diff --git a/gemeinsamforschen/src/main/webapp/assets/js/annotationScript.js b/gemeinsamforschen/src/main/webapp/assets/js/annotationScript.js
index 42bf5fd9..5150c1f9 100644
--- a/gemeinsamforschen/src/main/webapp/assets/js/annotationScript.js
+++ b/gemeinsamforschen/src/main/webapp/assets/js/annotationScript.js
@@ -143,6 +143,9 @@ $(document).ready(function() {
};
// send alter request to server
alterAnnotation(id, annotationPatchRequest, function (response) {
+ // send altered annotation to websocket
+ send("EDIT", id);
+
// alter the annotation card
card.find('.annotation-header-data-title').text(newTitle);
card.find('.annotation-body-text').text(newComment);
@@ -534,7 +537,7 @@ function saveNewAnnotation(title, comment, startCharacter, endCharacter) {
// send new annotation to back-end and display it in list
createAnnotation(annotationPostRequest, function(response) {
// send new annotation to websocket
- send("GET", response.id);
+ send("CREATE", response.id);
// display the new annotation
displayAnnotation(response);
@@ -561,6 +564,23 @@ function editAnnotationHandler(id) {
$('#annotation-edit-modal').data('id', id).modal("show");
}
+/**
+ * Change title and comment from annotation by given annotation
+ *
+ * @param annotation The given altered annotation
+ */
+function editAnnotationValues(annotation) {
+ // find annotation
+ var annotationElement = $('#' + annotation.id);
+
+ // set title and comment
+ annotationElement.find('.annotation-header-data-title').text(annotation.body.title);
+ annotationElement.find('.annotation-body-text').text(annotation.body.comment);
+
+ // handle drop down button
+ showAndHideToggleButtonById(annotation.id);
+}
+
/**
* Show or hide the drop down button for every annotation card.
* Call this on page resize and after annotations GET
@@ -591,3 +611,32 @@ function showAndHideToggleButton() {
})
}
+
+/**
+ * Show or hide the drop down button for a given annotation card.
+ *
+ * @param id The id of the annotation
+ */
+function showAndHideToggleButtonById(id) {
+ // find annotation
+ var annotationElement = $('#' + id);
+ // find the comment element, clone and hide it
+ var comment = annotationElement.find('.annotation-body').children('p');
+ var clone = comment.clone()
+ .css({display: 'inline', width: 'auto', visibility: 'hidden'})
+ .appendTo('body');
+ var cloneWidth = clone.width();
+
+ // remove the element from the page
+ clone.remove();
+
+ // show drop down button only if text was truncated
+ if(cloneWidth > comment.width()) {
+ annotationElement.find('.annotation-header-toggle').show();
+ annotationElement.find('.annotation-header-data').css('width', 'calc(100% - 40px)');
+ }
+ else {
+ annotationElement.find('.annotation-header-toggle').hide();
+ annotationElement.find('.annotation-header-data').css('width', '100%');
+ }
+}
diff --git a/gemeinsamforschen/src/main/webapp/assets/js/annotationWebsocket.js b/gemeinsamforschen/src/main/webapp/assets/js/annotationWebsocket.js
index 331b8b2f..62bbd2f3 100644
--- a/gemeinsamforschen/src/main/webapp/assets/js/annotationWebsocket.js
+++ b/gemeinsamforschen/src/main/webapp/assets/js/annotationWebsocket.js
@@ -10,7 +10,7 @@ function connect(targetId) {
var message = JSON.parse(e.data);
console.log(message.from)
- if (message.type === "GET") {
+ if (message.type === "CREATE") {
// get annotation from server
getAnnotation(message.annotationId, function (response) {
// display annotation
@@ -21,6 +21,11 @@ function connect(targetId) {
// remove annotation from list
$('#' + message.annotationId).closest('.listelement').remove()
}
+ else if (message.type === "EDIT") {
+ getAnnotation(message.annotationId, function (response) {
+ editAnnotationValues(response);
+ })
+ }
};
}
--
GitLab