diff --git a/gemeinsamforschen/src/main/webapp/assets/js/annotationScript.js b/gemeinsamforschen/src/main/webapp/assets/js/annotationScript.js
index aa2683ebebc92c0f3b633a44f04c3698e1f3d678..beba2528b6e0ece7ca6ba9a2c4ea65d89d9693c1 100644
--- a/gemeinsamforschen/src/main/webapp/assets/js/annotationScript.js
+++ b/gemeinsamforschen/src/main/webapp/assets/js/annotationScript.js
@@ -52,10 +52,10 @@ $(document).ready(function() {
});
/**
- * next button
+ * continue button
*/
- $('#btnSave').click(function () {
- location.href="#"
+ $('#btnContinue').click(function () {
+ location.href="givefeedback.jsp?token=" + getUserTokenFromUrl();
});
documentText = $('#documentText').html();
diff --git a/gemeinsamforschen/src/main/webapp/assets/js/project-student.js b/gemeinsamforschen/src/main/webapp/assets/js/project-student.js
index d24ac7a11a93b9920fa7a86fb66b249dcab31302..c227b61fd5144e4af59f494d5596b6a2fa7396fd 100644
--- a/gemeinsamforschen/src/main/webapp/assets/js/project-student.js
+++ b/gemeinsamforschen/src/main/webapp/assets/js/project-student.js
@@ -2,4 +2,8 @@ $(document).ready(function(){
$('#projectId').on('click', function(){
location.href="project-student.jsp?token="+getUserTokenFromUrl();
});
+
+ $('.givefeedback').click(function () {
+ location.href="annotation-document.jsp?token="+getUserTokenFromUrl();
+ })
});
\ No newline at end of file
diff --git a/gemeinsamforschen/src/main/webapp/pages/annotation_document.html b/gemeinsamforschen/src/main/webapp/pages/annotation-document.jsp
similarity index 90%
rename from gemeinsamforschen/src/main/webapp/pages/annotation_document.html
rename to gemeinsamforschen/src/main/webapp/pages/annotation-document.jsp
index 1939604ebfd5b6fbfe0e80d88c32849881ebae85..3e2175d850ccb0404263c14bf6970b3eb5ca17d3 100644
--- a/gemeinsamforschen/src/main/webapp/pages/annotation_document.html
+++ b/gemeinsamforschen/src/main/webapp/pages/annotation-document.jsp
@@ -1,3 +1,5 @@
+<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="menu"%>
+
<!DOCTYPE html>
<html>
@@ -27,6 +29,8 @@
<script src="https://cdnjs.cloudflare.com/ajax/libs/jqueryui/1.12.1/jquery-ui.min.js" type="text/javascript"></script>
<!-- js - contextMenu script -->
<script src="https://swisnl.github.io/jQuery-contextMenu/dist/jquery.contextMenu.js" type="text/javascript"></script>
+ <!-- js - utility script -->
+ <script src="../assets/js/utility.js"></script>
<!-- js - annotationScript -->
<script src="../assets/js/annotationScript.js"></script>
@@ -34,16 +38,7 @@
<body>
<div id="wrapper" class="full-height">
- <div id="sidebar-wrapper">
- <ul class="sidebar-nav">
- <li class="sidebar-brand"><a href="#">overview</a></li>
- <li><a href="#">Quizfrage</a></li>
- <li><a href="#">ePortfolio</a></li>
- <li><a href="#">Beitrag</a></li>
- <li><a href="#">Bewertung</a></li>
- <li><a href="#">Logout</a></li>
- </ul>
- </div>
+ <menu:menu></menu:menu>
<div class="page-content-wrapper full-height">
<div class="container-fluid full-height">
<div class="container-fluid-content">
@@ -67,7 +62,7 @@
</div>
<div class="leftcontent-buttons">
<div class="leftcontent-buttons-next">
- <button id="btnSave" type="button" class="btn btn-secondary">Weiter</button>
+ <button id="btnContinue" type="button" class="btn btn-secondary">Weiter</button>
</div>
</div>
</div>
diff --git a/gemeinsamforschen/src/main/webapp/pages/project-student.jsp b/gemeinsamforschen/src/main/webapp/pages/project-student.jsp
index f98ae5fdf8babb439711637e9a56183d049e2649..c2bd7ecbb67b7d971cb651dd640732ab2740d80c 100644
--- a/gemeinsamforschen/src/main/webapp/pages/project-student.jsp
+++ b/gemeinsamforschen/src/main/webapp/pages/project-student.jsp
@@ -19,7 +19,7 @@
<link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.1.0/css/all.css" integrity="sha384-lKuwvrZot6UHsBSfcMvOkWwlCMgc0TaWr+30HWe3a4ltaBwTZhyTEggF5tJv8tbt" crossorigin="anonymous">
<script src="../assets/js/utility.js"></script>
<script src="../assets/js/viewfeedback.js"></script>
- <script src="../assets/js/givefeedback.js"></script>
+ <script src="../assets/js/project-student.js"></script>
</head>
<body>
@@ -63,12 +63,12 @@
<hr>
<ul>
- <li><a role="button" onclick="getUserTokenFromUrl()" >
+ <li><a class="givefeedback" role="button">
Projektuebersicht hochgeladen
<i class="far fa-comments"></i>
</a>
</li>
- <li><a role="button" onclick="getUserTokenFromUrl()">
+ <li><a class="givefeedback" role="button">
Blumen ins Hausaufgabenheft geklebt
<i class="far fa-comments"></i>
</a>
@@ -84,15 +84,15 @@
<a href="#">student2@uni.de</a>
<hr>
<ul>
- <li><a id="givefeedback" role="button">
+ <li><a class="givefeedback" role="button">
feedback zu Herbarium im Hausaufgabenheft gegeben
<i class="far fa-comments"></i>
</a></li>
- <li><a id="givefeedback" role="button">
+ <li><a class="givefeedback" role="button">
Blumen an Vegetarier verfuettert
<i class="far fa-comments"></i>
</a></li>
- <li><a id="givefeedback" role="button">
+ <li><a class="givefeedback" role="button">
Die armen Vegetarier
<i class="far fa-comments"></i>
</a></li>
@@ -106,7 +106,7 @@
<a href="#">student3@uni.de</a>
<hr>
<ul>
- <li><a id="givefeedback" role="button">
+ <li><a class="givefeedback" role="button">
Viva la Floristika
<i class="far fa-comments"></i>
</a>
diff --git a/gemeinsamforschen/src/scripts/dbschema/fltrail.sql b/gemeinsamforschen/src/scripts/dbschema/fltrail.sql
index c92c03da44cc2448ac7b5e9d09cb274997e2459d..a930e3f00837538d9e256dc9e008add7e1c3de8d 100644
--- a/gemeinsamforschen/src/scripts/dbschema/fltrail.sql
+++ b/gemeinsamforschen/src/scripts/dbschema/fltrail.sql
@@ -61,6 +61,17 @@ CREATE TABLE if not exists projectuser
ENGINE = InnoDB
DEFAULT CHARSET = utf8;
+CREATE TABLE `annotations` (
+ `id` varchar(120) NOT NULL,
+ `timestamp` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+ `userId` int(11) DEFAULT NULL,
+ `targetId` int(11) DEFAULT NULL,
+ `body` varchar(280) DEFAULT NULL,
+ `startCharacter` int(11) DEFAULT NULL,
+ `endCharacter` int(11) DEFAULT NULL,
+ PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
alter table users
add isStudent tinyint(1) default '1' null;