From d1e047bc145ce32265e3b210e277b48769c06cc8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Johannes=20Zei=C3=9Fe?= <johannes.zeisse@uni-potsdam.de>
Date: Thu, 6 Sep 2018 17:06:33 +0200
Subject: [PATCH] Fixed Tokens and links (work in progress)

---
 .../gf/core/management/user/Menu.java         |  2 +-
 .../assets/css/researchReportOverview.css     | 13 +++++-
 .../src/main/webapp/assets/js/createReport.js |  4 --
 .../main/webapp/assets/js/createReportBibo.js | 17 ++++++++
 .../webapp/assets/js/createReportConcept.js   | 17 ++++++++
 .../main/webapp/assets/js/createReportDo.js   | 17 ++++++++
 .../assets/js/createReportEvaluation.js       | 17 ++++++++
 .../webapp/assets/js/createReportMethod.js    | 17 ++++++++
 .../webapp/assets/js/createReportOverview.js  | 21 ++++++++++
 .../webapp/assets/js/createReportProgress.js  | 41 +++++++++++++++++++
 .../webapp/assets/js/createReportQuestion.js  | 17 ++++++++
 .../webapp/assets/js/createReportRecherche.js | 17 ++++++++
 .../webapp/assets/js/createReportTitle.js     | 17 ++++++++
 .../main/webapp/pages/researchReportBibo.jsp  |  4 +-
 .../webapp/pages/researchReportConcept.jsp    |  4 +-
 .../main/webapp/pages/researchReportDo.jsp    |  4 +-
 .../webapp/pages/researchReportEvaluation.jsp |  4 +-
 .../webapp/pages/researchReportMethod.jsp     |  4 +-
 .../webapp/pages/researchReportOverview.jsp   | 13 ++++--
 .../webapp/pages/researchReportQuestion.jsp   |  4 +-
 .../webapp/pages/researchReportRecherche.jsp  |  4 +-
 .../main/webapp/pages/researchReportTitle.jsp | 24 +++++------
 22 files changed, 247 insertions(+), 35 deletions(-)
 delete mode 100644 gemeinsamforschen/src/main/webapp/assets/js/createReport.js
 create mode 100644 gemeinsamforschen/src/main/webapp/assets/js/createReportBibo.js
 create mode 100644 gemeinsamforschen/src/main/webapp/assets/js/createReportConcept.js
 create mode 100644 gemeinsamforschen/src/main/webapp/assets/js/createReportDo.js
 create mode 100644 gemeinsamforschen/src/main/webapp/assets/js/createReportEvaluation.js
 create mode 100644 gemeinsamforschen/src/main/webapp/assets/js/createReportMethod.js
 create mode 100644 gemeinsamforschen/src/main/webapp/assets/js/createReportOverview.js
 create mode 100644 gemeinsamforschen/src/main/webapp/assets/js/createReportProgress.js
 create mode 100644 gemeinsamforschen/src/main/webapp/assets/js/createReportQuestion.js
 create mode 100644 gemeinsamforschen/src/main/webapp/assets/js/createReportRecherche.js
 create mode 100644 gemeinsamforschen/src/main/webapp/assets/js/createReportTitle.js

diff --git a/gemeinsamforschen/src/main/java/unipotsdam/gf/core/management/user/Menu.java b/gemeinsamforschen/src/main/java/unipotsdam/gf/core/management/user/Menu.java
index d08c07de..2c8ef866 100644
--- a/gemeinsamforschen/src/main/java/unipotsdam/gf/core/management/user/Menu.java
+++ b/gemeinsamforschen/src/main/java/unipotsdam/gf/core/management/user/Menu.java
@@ -29,7 +29,7 @@ public class Menu extends SimpleTagSupport {
                         "            <li><a href=\"profile.jsp?token="+token+"&projectId="+projectId+"\">Profil</a></li>\n" +
                         "            <li><a href=\"Quiz.jsp?token="+token+"&projectId="+projectId+"\">Quizfrage</a></li>\n" +
                         "            <li><a href=\"eportfolio.jsp?token="+token+"&projectId="+projectId+"\">ePortfolio</a></li>\n" +
-                        "            <li><a href=\"researchReportTitle.jsp?token="+token+"&projectId="+projectId+"\">Beitrag</a></li>\n" +
+                        "            <li><a href=\"researchReportOverview.jsp?token="+token+"&projectId="+projectId+"\">Beitrag</a></li>\n" +
                         "            <li><a href=\"finalAssessments.jsp?token="+token+"&projectId="+projectId+"\">Bewertung</a></li>\n" +
                         "            <li><a href=\"../index.jsp\">Logout</a></li>\n" +
                         "        </ul>\n" +
diff --git a/gemeinsamforschen/src/main/webapp/assets/css/researchReportOverview.css b/gemeinsamforschen/src/main/webapp/assets/css/researchReportOverview.css
index 7e58a10d..b4fbd6ef 100644
--- a/gemeinsamforschen/src/main/webapp/assets/css/researchReportOverview.css
+++ b/gemeinsamforschen/src/main/webapp/assets/css/researchReportOverview.css
@@ -86,7 +86,7 @@ body, html {
     display: grid;
     grid-template-rows: 4rem 50vh 2rem 50vh;
     grid-template-columns: 1fr 1fr 1fr 1fr 1fr;
-    grid-template-areas: "header header header header header" "report report report report report" ". . upload . ." "feed feed feed feed feed";
+    grid-template-areas: "header header header header header" "report report report report report" ". . buttons . ." "feed feed feed feed feed";
 }
 .researchReportOverview .researchReportTitlebar {
     grid-area: header;
@@ -136,3 +136,14 @@ body, html {
 
 
 }
+
+.researchReportOverview .researchReportButtons {
+    background-color: #4CAF50;
+    border: 1.8px solid black;
+    color: gray;
+    grid-area: buttons;
+    padding: 15px 25px;
+    text-align: Center;
+    font-size: 16px;
+    cursor: pointer;
+}
diff --git a/gemeinsamforschen/src/main/webapp/assets/js/createReport.js b/gemeinsamforschen/src/main/webapp/assets/js/createReport.js
deleted file mode 100644
index b3c7741a..00000000
--- a/gemeinsamforschen/src/main/webapp/assets/js/createReport.js
+++ /dev/null
@@ -1,4 +0,0 @@
-$(document).ready(function() {
-        $('#backLink').on('click', function(){
-                location.href="researchReportTitle.jsp?token="+getUserTokenFromUrl();
-            })})
\ No newline at end of file
diff --git a/gemeinsamforschen/src/main/webapp/assets/js/createReportBibo.js b/gemeinsamforschen/src/main/webapp/assets/js/createReportBibo.js
new file mode 100644
index 00000000..f081bae6
--- /dev/null
+++ b/gemeinsamforschen/src/main/webapp/assets/js/createReportBibo.js
@@ -0,0 +1,17 @@
+var student = getQueryVariable("token");
+var project = getQueryVariable("projectId");
+
+$(document).ready(function() {
+    $('#student').val(student);
+    $('#project').val(project);
+    $('#backLink').on('click', function(){
+        location.href = "createReportOverview.jsp?token=" + student + "&projectId=" + project;
+        return false;
+    });
+
+    $('#forwardLink').on('click', function(){
+        location.href = "researchReportResearch.jsp?token=" + student + "&projectId=" + project;
+        return false;
+    });
+
+})
\ No newline at end of file
diff --git a/gemeinsamforschen/src/main/webapp/assets/js/createReportConcept.js b/gemeinsamforschen/src/main/webapp/assets/js/createReportConcept.js
new file mode 100644
index 00000000..f081bae6
--- /dev/null
+++ b/gemeinsamforschen/src/main/webapp/assets/js/createReportConcept.js
@@ -0,0 +1,17 @@
+var student = getQueryVariable("token");
+var project = getQueryVariable("projectId");
+
+$(document).ready(function() {
+    $('#student').val(student);
+    $('#project').val(project);
+    $('#backLink').on('click', function(){
+        location.href = "createReportOverview.jsp?token=" + student + "&projectId=" + project;
+        return false;
+    });
+
+    $('#forwardLink').on('click', function(){
+        location.href = "researchReportResearch.jsp?token=" + student + "&projectId=" + project;
+        return false;
+    });
+
+})
\ No newline at end of file
diff --git a/gemeinsamforschen/src/main/webapp/assets/js/createReportDo.js b/gemeinsamforschen/src/main/webapp/assets/js/createReportDo.js
new file mode 100644
index 00000000..f081bae6
--- /dev/null
+++ b/gemeinsamforschen/src/main/webapp/assets/js/createReportDo.js
@@ -0,0 +1,17 @@
+var student = getQueryVariable("token");
+var project = getQueryVariable("projectId");
+
+$(document).ready(function() {
+    $('#student').val(student);
+    $('#project').val(project);
+    $('#backLink').on('click', function(){
+        location.href = "createReportOverview.jsp?token=" + student + "&projectId=" + project;
+        return false;
+    });
+
+    $('#forwardLink').on('click', function(){
+        location.href = "researchReportResearch.jsp?token=" + student + "&projectId=" + project;
+        return false;
+    });
+
+})
\ No newline at end of file
diff --git a/gemeinsamforschen/src/main/webapp/assets/js/createReportEvaluation.js b/gemeinsamforschen/src/main/webapp/assets/js/createReportEvaluation.js
new file mode 100644
index 00000000..f081bae6
--- /dev/null
+++ b/gemeinsamforschen/src/main/webapp/assets/js/createReportEvaluation.js
@@ -0,0 +1,17 @@
+var student = getQueryVariable("token");
+var project = getQueryVariable("projectId");
+
+$(document).ready(function() {
+    $('#student').val(student);
+    $('#project').val(project);
+    $('#backLink').on('click', function(){
+        location.href = "createReportOverview.jsp?token=" + student + "&projectId=" + project;
+        return false;
+    });
+
+    $('#forwardLink').on('click', function(){
+        location.href = "researchReportResearch.jsp?token=" + student + "&projectId=" + project;
+        return false;
+    });
+
+})
\ No newline at end of file
diff --git a/gemeinsamforschen/src/main/webapp/assets/js/createReportMethod.js b/gemeinsamforschen/src/main/webapp/assets/js/createReportMethod.js
new file mode 100644
index 00000000..f081bae6
--- /dev/null
+++ b/gemeinsamforschen/src/main/webapp/assets/js/createReportMethod.js
@@ -0,0 +1,17 @@
+var student = getQueryVariable("token");
+var project = getQueryVariable("projectId");
+
+$(document).ready(function() {
+    $('#student').val(student);
+    $('#project').val(project);
+    $('#backLink').on('click', function(){
+        location.href = "createReportOverview.jsp?token=" + student + "&projectId=" + project;
+        return false;
+    });
+
+    $('#forwardLink').on('click', function(){
+        location.href = "researchReportResearch.jsp?token=" + student + "&projectId=" + project;
+        return false;
+    });
+
+})
\ No newline at end of file
diff --git a/gemeinsamforschen/src/main/webapp/assets/js/createReportOverview.js b/gemeinsamforschen/src/main/webapp/assets/js/createReportOverview.js
new file mode 100644
index 00000000..1c28d5e6
--- /dev/null
+++ b/gemeinsamforschen/src/main/webapp/assets/js/createReportOverview.js
@@ -0,0 +1,21 @@
+var student = getQueryVariable("token");
+var project = getQueryVariable("projectId");
+
+$(document).ready(function() {
+    $('#student').val(student);
+    $('#project').val(project);
+        $('#uploader').on('click', function(){
+                //location.href="researchReportTitle.jsp?token="+getUserTokenFromUrl();
+            //boolean uploaded=true;
+            });
+    $('#backLink').on('click', function(){
+        location.href = "overview-student.jsp?token=" + student + "&projectId=" + project;
+        return false;
+    });
+
+    $('#forwardLink').on('click', function(){
+        location.href = "researchReportTitle.jsp?token=" + student + "&projectId=" + project;
+        return false;
+    });
+
+})
diff --git a/gemeinsamforschen/src/main/webapp/assets/js/createReportProgress.js b/gemeinsamforschen/src/main/webapp/assets/js/createReportProgress.js
new file mode 100644
index 00000000..943d90fc
--- /dev/null
+++ b/gemeinsamforschen/src/main/webapp/assets/js/createReportProgress.js
@@ -0,0 +1,41 @@
+var student = getQueryVariable("token");
+var project = getQueryVariable("projectId");
+
+$(document).ready(function() {
+    $('#student').val(student);
+    $('#project').val(project);
+
+    $('#title').on('click', function(){
+        location.href = "researchReportTitle.jsp?token=" + student + "&projectId=" + project;
+        return false;
+    });
+    $('#recherche').on('click', function(){
+        location.href = "researchReportRecherche.jsp?token=" + student + "&projectId=" + project;
+        return false;
+    });
+    $('#bibo').on('click', function(){
+        location.href = "researchReportBibo.jsp?token=" + student + "&projectId=" + project;
+        return false;
+    });
+    $('#question').on('click', function(){
+        location.href = "researchReportQuestion.jsp?token=" + student + "&projectId=" + project;
+        return false;
+    });
+    $('#concept').on('click', function(){
+        location.href = "researchReportConcept.jsp?token=" + student + "&projectId=" + project;
+        return false;
+    });
+    $('#method').on('click', function(){
+        location.href = "researchReportMethod.jsp?token=" + student + "&projectId=" + project;
+        return false;
+    });
+    $('#reportDo').on('click', function(){
+        location.href = "researchReportDo.jsp?token=" + student + "&projectId=" + project;
+        return false;
+    });
+    $('#evaluation').on('click', function(){
+        location.href = "researchReportEvaluation.jsp?token=" + student + "&projectId=" + project;
+        return false;
+    });
+
+})
diff --git a/gemeinsamforschen/src/main/webapp/assets/js/createReportQuestion.js b/gemeinsamforschen/src/main/webapp/assets/js/createReportQuestion.js
new file mode 100644
index 00000000..f081bae6
--- /dev/null
+++ b/gemeinsamforschen/src/main/webapp/assets/js/createReportQuestion.js
@@ -0,0 +1,17 @@
+var student = getQueryVariable("token");
+var project = getQueryVariable("projectId");
+
+$(document).ready(function() {
+    $('#student').val(student);
+    $('#project').val(project);
+    $('#backLink').on('click', function(){
+        location.href = "createReportOverview.jsp?token=" + student + "&projectId=" + project;
+        return false;
+    });
+
+    $('#forwardLink').on('click', function(){
+        location.href = "researchReportResearch.jsp?token=" + student + "&projectId=" + project;
+        return false;
+    });
+
+})
\ No newline at end of file
diff --git a/gemeinsamforschen/src/main/webapp/assets/js/createReportRecherche.js b/gemeinsamforschen/src/main/webapp/assets/js/createReportRecherche.js
new file mode 100644
index 00000000..f081bae6
--- /dev/null
+++ b/gemeinsamforschen/src/main/webapp/assets/js/createReportRecherche.js
@@ -0,0 +1,17 @@
+var student = getQueryVariable("token");
+var project = getQueryVariable("projectId");
+
+$(document).ready(function() {
+    $('#student').val(student);
+    $('#project').val(project);
+    $('#backLink').on('click', function(){
+        location.href = "createReportOverview.jsp?token=" + student + "&projectId=" + project;
+        return false;
+    });
+
+    $('#forwardLink').on('click', function(){
+        location.href = "researchReportResearch.jsp?token=" + student + "&projectId=" + project;
+        return false;
+    });
+
+})
\ No newline at end of file
diff --git a/gemeinsamforschen/src/main/webapp/assets/js/createReportTitle.js b/gemeinsamforschen/src/main/webapp/assets/js/createReportTitle.js
new file mode 100644
index 00000000..d158a293
--- /dev/null
+++ b/gemeinsamforschen/src/main/webapp/assets/js/createReportTitle.js
@@ -0,0 +1,17 @@
+var student = getQueryVariable("token");
+var project = getQueryVariable("projectId");
+
+$(document).ready(function() {
+    $('#student').val(student);
+    $('#project').val(project);
+    $('#backLink').on('click', function(){
+        location.href = "createReportOverview.jsp?token=" + student + "&projectId=" + project;
+        return false;
+    });
+
+    $('#forwardLink').on('click', function(){
+        location.href = "researchReportResearch.jsp?token=" + student + "&projectId=" + project;
+        return false;
+    });
+
+})
diff --git a/gemeinsamforschen/src/main/webapp/pages/researchReportBibo.jsp b/gemeinsamforschen/src/main/webapp/pages/researchReportBibo.jsp
index ded4d5a4..fec68ae6 100644
--- a/gemeinsamforschen/src/main/webapp/pages/researchReportBibo.jsp
+++ b/gemeinsamforschen/src/main/webapp/pages/researchReportBibo.jsp
@@ -68,8 +68,8 @@
 </div>
 
 
-<script src="../assets/js/createReport.js"></script>
-<script src="../assets/js/researchReportUpload.js"></script>
+<script  src="../assets/js/createReportBibo.js"></script>
+<script  src="../assets/js/createReportProgress.js"></script>
 <script src="https://unpkg.com/filepond/dist/filepond.js"></script> <!--FilePond -->
 <script src="https://unpkg.com/filepond-plugin-image-preview/dist/filepond-plugin-image-preview.js"></script> <!--FilePond -->
 <script>FilePond.parse(document.body);</script> <!--FilePond -->
diff --git a/gemeinsamforschen/src/main/webapp/pages/researchReportConcept.jsp b/gemeinsamforschen/src/main/webapp/pages/researchReportConcept.jsp
index a85a8f85..9a08144d 100644
--- a/gemeinsamforschen/src/main/webapp/pages/researchReportConcept.jsp
+++ b/gemeinsamforschen/src/main/webapp/pages/researchReportConcept.jsp
@@ -55,8 +55,8 @@
 </form>
 
 
-<script src="../assets/js/createReport.js"></script>
-<script src="../assets/js/researchReportUpload.js"></script>
+<script  src="../assets/js/createReportConcept.js"></script>
+<script  src="../assets/js/createReportProgress.js"></script>
 <script src="https://unpkg.com/filepond/dist/filepond.js"></script> <!--FilePond -->
 <script src="https://unpkg.com/filepond-plugin-image-preview/dist/filepond-plugin-image-preview.js"></script> <!--FilePond -->
 <script>FilePond.parse(document.body);</script> <!--FilePond -->
diff --git a/gemeinsamforschen/src/main/webapp/pages/researchReportDo.jsp b/gemeinsamforschen/src/main/webapp/pages/researchReportDo.jsp
index 88f9ad2d..d7f041fa 100644
--- a/gemeinsamforschen/src/main/webapp/pages/researchReportDo.jsp
+++ b/gemeinsamforschen/src/main/webapp/pages/researchReportDo.jsp
@@ -67,8 +67,8 @@
 </div>
 
 
-<script  src="../assets/js/createReport.js"></script>
-<script  src="../assets/js/researchReportUpload.js"></script>
+<script  src="../assets/js/createReportDo.js"></script>
+<script  src="../assets/js/createReportProgress.js"></script>
 <script src="https://unpkg.com/filepond/dist/filepond.js"></script> <!--FilePond -->
 <script src="https://unpkg.com/filepond-plugin-image-preview/dist/filepond-plugin-image-preview.js"></script> <!--FilePond -->
 <script>FilePond.parse(document.body);</script> <!--FilePond -->
diff --git a/gemeinsamforschen/src/main/webapp/pages/researchReportEvaluation.jsp b/gemeinsamforschen/src/main/webapp/pages/researchReportEvaluation.jsp
index 1166e03a..4460368f 100644
--- a/gemeinsamforschen/src/main/webapp/pages/researchReportEvaluation.jsp
+++ b/gemeinsamforschen/src/main/webapp/pages/researchReportEvaluation.jsp
@@ -67,8 +67,8 @@
 </div>
 
 
-<script src="../assets/js/createReport.js"></script>
-<script src="../assets/js/researchReportUpload.js"></script>
+<script  src="../assets/js/createReportEvaluation.js"></script>
+<script  src="../assets/js/createReportProgress.js"></script>
 <script src="https://unpkg.com/filepond/dist/filepond.js"></script> <!--FilePond -->
 <script src="https://unpkg.com/filepond-plugin-image-preview/dist/filepond-plugin-image-preview.js"></script> <!--FilePond -->
 <script>FilePond.parse(document.body);</script> <!--FilePond -->
diff --git a/gemeinsamforschen/src/main/webapp/pages/researchReportMethod.jsp b/gemeinsamforschen/src/main/webapp/pages/researchReportMethod.jsp
index 46da7e8f..1338626c 100644
--- a/gemeinsamforschen/src/main/webapp/pages/researchReportMethod.jsp
+++ b/gemeinsamforschen/src/main/webapp/pages/researchReportMethod.jsp
@@ -68,8 +68,8 @@
 </div>
 
 
-<script src="../assets/js/createReport.js"></script>
-<script src="../assets/js/researchReportUpload.js"></script>
+<script  src="../assets/js/createReportMethod.js"></script>
+<script  src="../assets/js/createReportProgress.js"></script>
 <script src="https://unpkg.com/filepond/dist/filepond.js"></script> <!--FilePond -->
 <script src="https://unpkg.com/filepond-plugin-image-preview/dist/filepond-plugin-image-preview.js"></script> <!--FilePond -->
 <script>FilePond.parse(document.body);</script> <!--FilePond -->
diff --git a/gemeinsamforschen/src/main/webapp/pages/researchReportOverview.jsp b/gemeinsamforschen/src/main/webapp/pages/researchReportOverview.jsp
index 0698c56f..014075ee 100644
--- a/gemeinsamforschen/src/main/webapp/pages/researchReportOverview.jsp
+++ b/gemeinsamforschen/src/main/webapp/pages/researchReportOverview.jsp
@@ -11,6 +11,7 @@
     <link href="https://unpkg.com/filepond/dist/filepond.css" rel="stylesheet"> <!--FilePond -->
     <link href="https://unpkg.com/filepond-plugin-image-preview/dist/filepond-plugin-image-preview.css" rel="stylesheet"> <!--FilePond -->
     <link rel="stylesheet" type="text/css" href="../assets/css/researchReportOverview.css">
+    <script src="../assets/js/createReportOverview.js"></script>
     <title>Forschungsbericht Ãœbersicht</title>
 
 
@@ -62,10 +63,10 @@
                 </table>
             </div>
 
-    <div class="ResearchReportUpload">
+  <!--  <div class="ResearchReportUpload">
         <h3>Gesamten Forschungsbericht hochladen </h3>
         <input type="file" class="filepond" name="filepond">
-    </div>
+    </div> -->
 
     <div class="feedbacks">
         <h2>Feedbacks</h2>
@@ -97,6 +98,13 @@
         </table>
     </div>
 
+
+     <div class="ResearchReportButtons">
+         <button class="researchReportButtons"><a id="uploader">Upload File</a></button>
+         <button class="researchReportButtons"><a id="forwardLink">Bericht erstellen</a></button>
+         <button class="researchReportButtons"><a id="backLink">Zur&uuml;ck</a></button>
+     </div>
+
                         </form>
                     </td>
                 </tr>
@@ -110,7 +118,6 @@
 
 <script src="https://unpkg.com/filepond/dist/filepond.js"></script> <!--FilePond -->
 <script src="https://unpkg.com/filepond-plugin-image-preview/dist/filepond-plugin-image-preview.js"></script> <!--FilePond -->
-<script src="../assets/js/researchReportUpload.js"></script><!--FilePond -->
 <script>FilePond.parse(document.body);</script> <!--FilePond -->
 
 
diff --git a/gemeinsamforschen/src/main/webapp/pages/researchReportQuestion.jsp b/gemeinsamforschen/src/main/webapp/pages/researchReportQuestion.jsp
index db549022..72d0e3b9 100644
--- a/gemeinsamforschen/src/main/webapp/pages/researchReportQuestion.jsp
+++ b/gemeinsamforschen/src/main/webapp/pages/researchReportQuestion.jsp
@@ -69,8 +69,8 @@
 </div>
 
 
-<script src="../assets/js/createReport.js"></script>
-<script src="../assets/js/researchReportUpload.js"></script>
+<script  src="../assets/js/createReportQuestion.js"></script>
+<script  src="../assets/js/createReportProgress.js"></script>
 <script src="https://unpkg.com/filepond/dist/filepond.js"></script> <!--FilePond -->
 <script src="https://unpkg.com/filepond-plugin-image-preview/dist/filepond-plugin-image-preview.js"></script> <!--FilePond -->
 <script>FilePond.parse(document.body);</script> <!--FilePond -->
diff --git a/gemeinsamforschen/src/main/webapp/pages/researchReportRecherche.jsp b/gemeinsamforschen/src/main/webapp/pages/researchReportRecherche.jsp
index fa33c548..73aff58e 100644
--- a/gemeinsamforschen/src/main/webapp/pages/researchReportRecherche.jsp
+++ b/gemeinsamforschen/src/main/webapp/pages/researchReportRecherche.jsp
@@ -71,8 +71,8 @@
 
 
 
-<script  src="../assets/js/createReport.js"></script>
-<script  src="../assets/js/researchReportUpload.js"></script>
+<script  src="../assets/js/createReportRecherche.js"></script>
+<script  src="../assets/js/createReportProgress.js"></script>
 <script src="https://unpkg.com/filepond/dist/filepond.js"></script> <!--FilePond -->
 <script src="https://unpkg.com/filepond-plugin-image-preview/dist/filepond-plugin-image-preview.js"></script> <!--FilePond -->
 <script>FilePond.parse(document.body);</script> <!--FilePond -->
diff --git a/gemeinsamforschen/src/main/webapp/pages/researchReportTitle.jsp b/gemeinsamforschen/src/main/webapp/pages/researchReportTitle.jsp
index 2e959103..87a24067 100644
--- a/gemeinsamforschen/src/main/webapp/pages/researchReportTitle.jsp
+++ b/gemeinsamforschen/src/main/webapp/pages/researchReportTitle.jsp
@@ -47,8 +47,8 @@
 				</textarea>
     </div>
     <div class="ResearchReportButtons">
-        <button class="researchReportButtons"><a href="researchReportRecherche.jsp">Speichern & weiter</a></button>
-        <button class="researchReportButtons"><a href="project-student.jsp"> Zur&uuml;ck </a></button>
+        <button class="researchReportButtons"><a id="forwardLink">Speichern & weiter</a></button>
+        <button class="researchReportButtons"><a id="backLink"> Zur&uuml;ck </a></button>
     </div>
 
     <div class="ResearchReportUpload">
@@ -59,14 +59,14 @@
     <div class="researchReportProgress">
         <nav>
             <menu>
-                <menuitem><a href="researchReportTitle.jsp"><font color="#green">Titel</font></a> </menuitem>
-                <menuitem><a href="researchReportRecherche.jsp">Recherche</a> </menuitem>
-                <menuitem><a href="researchReportBibo.jsp">Literaturverzeichnis</a> </menuitem>
-                <menuitem><a href="researchReportQuestion.jsp">Forschnugsfrage</a> </menuitem>
-                <menuitem><a href="researchReportConcept.jsp">Konzept</a></menuitem>
-                <menuitem><a href="researchReportMethod.jsp">Methodik</a></menuitem>
-                <menuitem><a href="researchReportDo.jsp">Durchf&uuml;hrung</a></menuitem>
-                <menuitem><a href="researchReportEvaluation.jsp">Evalution</a></menuitem>
+                <menuitem><a id="title"><font color="#green">Titel</font></a> </menuitem>
+                <menuitem><a id="recherche">Recherche</a> </menuitem>
+                <menuitem><a id="bibo">Literaturverzeichnis</a> </menuitem>
+                <menuitem><a id="question">Forschnugsfrage</a> </menuitem>
+                <menuitem><a id="concept">Konzept</a></menuitem>
+                <menuitem><a id="method">Methodik</a></menuitem>
+                <menuitem><a id="reportDo">Durchf&uuml;hrung</a></menuitem>
+                <menuitem><a id="evaluation">Evalution</a></menuitem>
             </menu>
         </nav>
     </div>
@@ -80,8 +80,8 @@
 </div>
 
 
-<script  src="../assets/js/createReport.js"></script>
-<script  src="../assets/js/researchReportUpload.js"></script>
+<script  src="../assets/js/createReportTitle.js"></script>
+<script  src="../assets/js/createReportProgress.js"></script>
 <script src="https://unpkg.com/filepond/dist/filepond.js"></script> <!--FilePond -->
 <script src="https://unpkg.com/filepond-plugin-image-preview/dist/filepond-plugin-image-preview.js"></script> <!--FilePond -->
 <script>FilePond.parse(document.body);</script> <!--FilePond -->
-- 
GitLab