fixing the merge

d03e1fc6 · wiepke · a384a94d · d03e1fc6 · d03e1fc6 · d03e1fc6
Commit d03e1fc6 authored 5 years ago by wiepke
--- a/gemeinsamforschen/src/main/webapp/annotation/create-unstructured-annotation.jsp
+++ b/gemeinsamforschen/src/main/webapp/annotation/create-unstructured-annotation.jsp
+<%@ page import="unipotsdam.gf.taglibs.TagUtilities" %>
 <%@ page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %>

 <%--<%@ taglib uri="../taglibs/gemeinsamForschen.tld" prefix="chat" %>--%>
-
+<%
+    TagUtilities tu = new TagUtilities();
+    String contributionCategory = tu.getParamterFromQuery("contributionCategory", request);
+    if (contributionCategory == null) {
+        contributionCategory = "Unbekannt";
+    }
+%>

 <!DOCTYPE html>
 <html>
@@ -26,6 +33,8 @@
    <script src="https://swisnl.github.io/jQuery-contextMenu/dist/jquery.contextMenu.js"
            type="text/javascript"></script>
    <!-- js - unstructuredRest -->
+    <script src="js/unstructuredUpload.js"></script>
+
    <script src="js/unstructuredRest.js"></script>
    <!-- js - unstructuredUpload -->
    <script src="js/unstructuredAnnotation.js"></script>
@@ -67,7 +76,7 @@
                </div>
                <div id="missingAnnotation" class="alert alert-warning"></div>
                <ol id="annotations">
-                <script id="annotationTemplate" type="text/x-jsrender">
+                    <script id="annotationTemplate" type="text/x-jsrender">

                    {{for categories}}
                        <li class="spacing">
@@ -91,6 +100,8 @@
    </jsp:include>
    <jsp:include page="../taglibs/footer.jsp"/>
 </div>
+<p id="contributionCategory" hidden><%= tu.printMe(contributionCategory)%>
+
 </body>

 </html>
--- a/gemeinsamforschen/src/main/webapp/annotation/js/unstructuredAnnotation.js
+++ b/gemeinsamforschen/src/main/webapp/annotation/js/unstructuredAnnotation.js
@@ -9,6 +9,9 @@ $(document).ready(function () {
    $('#missingAnnotation').hide();
    buildAnnotationList();
    // fetch the document text of the given id
+    getMyGroupId(getFullSubmissionOfGroup);
+
+    /*
    getFullSubmission(getQueryVariable("submissionId"), function (response) {
        // set text in div
        quill.setContents(JSON.parse(response.text));
@@ -35,7 +38,7 @@ $(document).ready(function () {
        // jump to upload page on error
        // location.href = "upload-unstructured-dossier.jsp"
    });
-
+    */
    // set click listener to save button
    $('#btnSave').click(function () {
        saveButtonHandler();

--- a/gemeinsamforschen/src/main/webapp/annotation/js/unstructuredUpload.js
+++ b/gemeinsamforschen/src/main/webapp/annotation/js/unstructuredUpload.js
@@ -4,6 +4,7 @@
 let groupId = 0;
 let contributionCategory;
 let hierarchyLevel;
+let fullSubmissionId = "";
 $(document).ready(function () {
    getMyGroupId(getFullSubmissionOfGroup);
    contributionCategory = $('#contributionCategory').html().trim();
@@ -76,6 +77,7 @@ function getFullSubmissionOfGroup(groupId) {
        success: function (fullSubmission) {
            //set content in Quill here
            quill.setContents(JSON.parse(fullSubmission.text));
+            fullSubmissionId = fullSubmission.id;
        },
        error: function () {


--- a/gemeinsamforschen/src/main/webapp/taglibs/js/utility.js
+++ b/gemeinsamforschen/src/main/webapp/taglibs/js/utility.js
@@ -242,4 +242,17 @@ function getMyGroupId(callback) {

        }
    })
+}
+
+function calculateHierachy(level) {
+
+    if (level === 0) {
+
+        return "";
+
+    } else {
+
+        return calculateHierachy(level - 1) + "../";
+
+    }
 }
\ No newline at end of file