From 6e615097da16e6e60aacddc7c51aefff6aa9c037 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sven=20K=C3=A4stle?= <sven.kaestle@gmx.de>
Date: Sun, 1 Jul 2018 18:11:36 +0200
Subject: [PATCH] refactor: Add annotation page into the 'click chain' of
feedback process
before:
project-student.js --> givefeedback.jsp
now:
project-student.js --> annotation-document.jsp --> givefeedback.jsp
---
.../src/main/webapp/assets/js/annotationScript.js | 6 +++---
.../src/main/webapp/assets/js/project-student.js | 4 ++++
.../src/main/webapp/pages/annotation-document.jsp | 4 +++-
.../src/main/webapp/pages/project-student.jsp | 14 +++++++-------
4 files changed, 17 insertions(+), 11 deletions(-)
diff --git a/gemeinsamforschen/src/main/webapp/assets/js/annotationScript.js b/gemeinsamforschen/src/main/webapp/assets/js/annotationScript.js
index aa2683eb..beba2528 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 d24ac7a1..c227b61f 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.jsp b/gemeinsamforschen/src/main/webapp/pages/annotation-document.jsp
index 0ec3e20d..3e2175d8 100644
--- a/gemeinsamforschen/src/main/webapp/pages/annotation-document.jsp
+++ b/gemeinsamforschen/src/main/webapp/pages/annotation-document.jsp
@@ -29,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>
@@ -60,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 f98ae5fd..c2bd7ecb 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>
--
GitLab