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 e5593b493426458b501b6e008f2cb26f87c539b2..f5ccb7490771953ed577159aef335bc032e59f00 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
@@ -26,7 +26,7 @@ public class Menu extends SimpleTagSupport {
" <li><a href=\"profile.jsp?token="+token+"\">Profil</a></li>\n" +
" <li><a href=\"Quiz.jsp?token="+token+"\">Quizfrage</a></li>\n" +
" <li><a href=\"eportfolio.jsp?token="+token+"\">ePortfolio</a></li>\n" +
- " <li><a href=\"#\">Beitrag</a></li>\n" +
+ " <li><a href=\"researchReportTitle.jsp?token="+token+"\">Beitrag</a></li>\n" +
" <li><a href=\"finalAssessments.jsp?token="+token+"\">Bewertung</a></li>\n" +
" <li><a href=\"../index.jsp\">Logout</a></li>\n" +
" </ul>\n" +
diff --git a/gemeinsamforschen/src/main/java/unipotsdam/gf/interfaces/ResearchReports.java b/gemeinsamforschen/src/main/java/unipotsdam/gf/interfaces/ResearchReports.java
new file mode 100644
index 0000000000000000000000000000000000000000..f7ff0377354ac1e86e8fba4be549e4787b299131
--- /dev/null
+++ b/gemeinsamforschen/src/main/java/unipotsdam/gf/interfaces/ResearchReports.java
@@ -0,0 +1,8 @@
+package unipotsdam.gf.interfaces;
+
+//import unipotsdam.gf.modules.assessment.controller.StudentIdentifier;
+import unipotsdam.gf.modules.researchreport.ResearchReport;
+
+public interface ResearchReports {
+ //java.util.List<ResearchReport> getReports(StudentIdentifier identifier);
+}
diff --git a/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/researchreport/Bibliography.java b/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/researchreport/Bibliography.java
new file mode 100644
index 0000000000000000000000000000000000000000..0bacc005a1cbac915cd0fc5f4beeb31664a90cec
--- /dev/null
+++ b/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/researchreport/Bibliography.java
@@ -0,0 +1,4 @@
+package unipotsdam.gf.modules.researchreport;
+
+public class Bibliography {
+}
diff --git a/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/researchreport/ResearchQuestion.java b/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/researchreport/ResearchQuestion.java
new file mode 100644
index 0000000000000000000000000000000000000000..e61f025f056a69ea18659cb52b7151e01b951446
--- /dev/null
+++ b/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/researchreport/ResearchQuestion.java
@@ -0,0 +1,4 @@
+package unipotsdam.gf.modules.researchreport;
+
+public class ResearchQuestion {
+}
diff --git a/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/researchreport/ResearchReport.java b/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/researchreport/ResearchReport.java
new file mode 100644
index 0000000000000000000000000000000000000000..c90d34735321bcdeb5b81ecc16acf509529d9625
--- /dev/null
+++ b/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/researchreport/ResearchReport.java
@@ -0,0 +1,110 @@
+package unipotsdam.gf.modules.researchreport;
+
+import java.io.File;
+import java.util.List;
+public class ResearchReport {
+ // TODO add properties
+ private String title;
+ private ResearchQuestion researchQuestion;
+ private List<String> learningGoals;
+ private String method;
+ private String research;
+ private Bibliography bibliography;
+ private String researchResult;
+ private String evaluation;
+ private File picture;
+ private Timeplanning timeplan;
+
+ public ResearchReport(String title, ResearchQuestion researchQuestion, List<String> learningGoals, String method, String research, Bibliography bibliography, String researchResult, String evaluation, File picture, Timeplanning timeplan) {
+ this.title = title;
+ this.researchQuestion = researchQuestion;
+ this.learningGoals = learningGoals;
+ this.method = method;
+ this.research = research;
+ this.bibliography = bibliography;
+ this.researchResult = researchResult;
+ this.evaluation = evaluation;
+ this.picture = picture;
+ this.timeplan = timeplan;
+ }
+
+ public String getTitle() {
+ return title;
+ }
+
+ public void setTitle(String title) {
+ this.title = title;
+ }
+
+ public ResearchQuestion getResearchQuestion() {
+ return researchQuestion;
+ }
+
+ public void setResearchQuestion(ResearchQuestion researchQuestion) {
+ this.researchQuestion = researchQuestion;
+ }
+
+ public List<String> getLearningGoals() {
+ return learningGoals;
+ }
+
+ public void setLearningGoals(List<String> learningGoals) {
+ this.learningGoals = learningGoals;
+ }
+
+ public String getMethod() {
+ return method;
+ }
+
+ public void setMethod(String method) {
+ this.method = method;
+ }
+
+ public String getResearch() {
+ return research;
+ }
+
+ public void setResearch(String research) {
+ this.research = research;
+ }
+
+ public Bibliography getBibliography() {
+ return bibliography;
+ }
+
+ public void setBibliography(Bibliography bibliography) {
+ this.bibliography = bibliography;
+ }
+
+ public String getResearchResult() {
+ return researchResult;
+ }
+
+ public void setResearchResult(String researchResult) {
+ this.researchResult = researchResult;
+ }
+
+ public String getEvaluation() {
+ return evaluation;
+ }
+
+ public void setEvaluation(String evaluation) {
+ this.evaluation = evaluation;
+ }
+
+ public File getPicture() {
+ return picture;
+ }
+
+ public void setPicture(File picture) {
+ this.picture = picture;
+ }
+
+ public Timeplanning getTimeplan() {
+ return timeplan;
+ }
+
+ public void setTimeplan(Timeplanning timeplan) {
+ this.timeplan = timeplan;
+ }
+}
diff --git a/gemeinsamforschen/src/main/java/unipotsdam/gf/interfaces/ResearchReport.java b/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/researchreport/ResearchReportManagement.java
similarity index 78%
rename from gemeinsamforschen/src/main/java/unipotsdam/gf/interfaces/ResearchReport.java
rename to gemeinsamforschen/src/main/java/unipotsdam/gf/modules/researchreport/ResearchReportManagement.java
index 4bb338e0f2c896bb167faf964eee6697620613c0..5355ab90768c8eadfc0800c2553dd70a483f5324 100644
--- a/gemeinsamforschen/src/main/java/unipotsdam/gf/interfaces/ResearchReport.java
+++ b/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/researchreport/ResearchReportManagement.java
@@ -1,6 +1,6 @@
-package unipotsdam.gf.interfaces;
+package unipotsdam.gf.modules.researchreport;
-import java.io.File;
+import unipotsdam.gf.modules.researchreport.ResearchReport;
import java.io.File;
@@ -9,7 +9,7 @@ import java.io.File;
*/
-public interface ResearchReport {
+public interface ResearchReportManagement {
/**
* Create a File
@@ -17,7 +17,7 @@ public interface ResearchReport {
* @param researchReport Name of the Report
* @return Returns the reportId
*/
- String createReseachReport(ResearchReport researchReport);
+ String createResearchReport(ResearchReport researchReport);
/**
diff --git a/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/researchreport/Timeplanning.java b/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/researchreport/Timeplanning.java
new file mode 100644
index 0000000000000000000000000000000000000000..f1ef159bf9bcf9929d02219b5bf660812e2d674f
--- /dev/null
+++ b/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/researchreport/Timeplanning.java
@@ -0,0 +1,4 @@
+package unipotsdam.gf.modules.researchreport;
+
+public class Timeplanning {
+}
diff --git a/gemeinsamforschen/src/main/webapp/assets/css/researchReport.css b/gemeinsamforschen/src/main/webapp/assets/css/researchReport.css
new file mode 100644
index 0000000000000000000000000000000000000000..bd132c97584a6d2df270969e785a565d28f9c3d6
--- /dev/null
+++ b/gemeinsamforschen/src/main/webapp/assets/css/researchReport.css
@@ -0,0 +1,182 @@
+/*
+html, body
+ width: 100%
+ height: 100%
+ margin: 0
+ padding: 0
+ font-size: 10px
+ font-family: 'Roboto', sans-serif
+ background-color: gray
+
+.researchReportForm
+ width: 100%
+ display: grid
+ grid-template-rows: 5rem 90vh 5rem
+ grid-template-columns: 15% 85%
+ grid-template-areas: "sidebar header header" "sidebar editor editor" "sidebar buttons ." "sidebar progress ."
+
+
+
+
+.researchReportMenu
+ background: black
+ color: white
+ grid-area: sidebar
+ nav
+ font-size: 1.5rem
+ menu
+ menuitem
+ a
+ color: White
+ text-decoration: none
+ margin: 0 0 0 1rem
+
+
+.researchReportTitlebar
+ background: #003f60
+ color: White
+ grid-area: header
+ display: flex
+ justify-content: center
+ align-items: center
+
+
+.researchReportEditor
+ grid-area: editor
+ background: gray
+ color: black
+ display: flex
+ justify-content: Left
+ align-items: Center
+ .editor-inhalt
+ margin: 6rem
+ padding: 6rem
+ font-size: 2rem
+ color: #fff
+ text-align: Left
+ width: 10%
+
+
+
+.researchReportProgress
+ background: #003f60
+ color: red
+ grid-area: progress
+ display: flex
+ justify-content: center
+ align-items: center
+ nav
+ font-size: 1.2rem
+ menu
+ menuitem
+ a
+ color: white
+ text-decoration: none
+ margin: 0 0 0 0rem
+ cursor: pointer
+
+
+
+
+
+.researchReportButtons
+ background-color: #4CAF50
+ border: 1.8px solid black
+ color: black
+ padding: 15px 25px
+ text-align: center
+ font-size: 16px
+ cursor: pointer
+
+*/
+
+
+
+
+
+html, body {
+ width: 100%;
+ height: 100%;
+ margin: 0;
+ padding: 0;
+ font-size: 10px;
+ font-family: "Roboto", sans-serif;
+ background-color: gray;
+}
+
+.researchReportForm {
+ width: 100%;
+ display: grid;
+ grid-template-rows: 5rem 90vh 5rem;
+ grid-template-columns: 15% 85%;
+ grid-template-areas: "sidebar header header" "sidebar editor editor" "sidebar . buttons " "sidebar progress .";
+}
+
+.researchReportMenu {
+ background: black;
+ color: white;
+ grid-area: sidebar;
+}
+.researchReportMenu nav {
+ font-size: 1.5rem;
+}
+.researchReportMenu nav menu menuitem a {
+ color: White;
+ text-decoration: none;
+ margin: 0 0 0 1rem;
+}
+
+.researchReportTitlebar {
+ background: #003f60;
+ color: White;
+ grid-area: header;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+}
+
+.researchReportEditor {
+ grid-area: editor;
+ background: gray;
+ color: black;
+ display: flex;
+ justify-content: Left;
+ align-items: Center;
+}
+.researchReportEditor .editor-inhalt {
+ margin: 6rem;
+ padding: 6rem;
+ font-size: 2rem;
+ color: #fff;
+ text-align: Left;
+ width: 10%;
+}
+
+.researchReportProgress {
+ background: #003f60;
+ color: red;
+ grid-area: progress;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+}
+.researchReportProgress nav {
+ font-size: 1.5rem;
+}
+.researchReportProgress nav menu menuitem a {
+ color: White;
+ text-decoration: none;
+ margin: 0 0 0 1rem;
+ cursor: pointer;
+}
+
+.researchReportButtons {
+ background-color: #4CAF50;
+ border: 1.8px solid black;
+ color: black;
+ padding: 15px 25px;
+ text-align: center;
+ font-size: 16px;
+ cursor: pointer;
+}
+
diff --git a/gemeinsamforschen/src/main/webapp/pages/researchReportBibo.jsp b/gemeinsamforschen/src/main/webapp/pages/researchReportBibo.jsp
new file mode 100644
index 0000000000000000000000000000000000000000..d381386797e3f00c8ffbd18c46527e2cfafb0c8b
--- /dev/null
+++ b/gemeinsamforschen/src/main/webapp/pages/researchReportBibo.jsp
@@ -0,0 +1,75 @@
+<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="menu"%>
+
+<!DOCTYPE html>
+
+<html>
+<head>
+ <meta charset="utf-8">
+ <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css">
+ <link rel="stylesheet" href="../assets/css/styles.css">
+ <script src="https://cdn.jsdelivr.net/npm/inscrybmde@1.11.3/dist/inscrybmde.min.js"></script>
+ <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.3.1/jquery.min.js"></script>
+ <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js"></script>
+ <script src="../assets/js/utility.js"></script>
+ <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/inscrybmde@1.11.3/dist/inscrybmde.min.css">
+ <link rel="stylesheet" href="../assets/fonts/font-awesome.min.css">
+ <link rel="stylesheet" href="../assets/css/Community-ChatComments.css">
+ <link rel="stylesheet" href="../assets/css/Sidebar-Menu-1.css">
+ <link rel="stylesheet" href="../assets/css/Sidebar-Menu.css">
+ <link rel="stylesheet" type="text/css" href="../assets/css/researchReport.css">
+ <title>Forschungsbericht erstellen</title>
+</head>
+<body>
+
+
+
+<form id="researchReportform" class="researchReportForm" method="POST" action="../rest/researchReport/save">
+
+ <div class = "researchReportMenu">
+ <nav>
+ <menu>
+ <menuitem><p><a href="">Gruppe</a></p> </menuitem>
+ <menuitem><p><a href="">Projekt erstellen</a> </p></menuitem>
+ <menuitem><p><a href="">Forschungsbericht erstellen</a></p></menuitem>
+ <menuitem><p><a href="">Review</a></p></menuitem>
+ <menuitem><p><a href="">User</a></p></menuitem>
+ </menu>
+ </nav>
+ </div>
+
+ <div class = "researchReportTitlebar">
+ <h1> Forschungsbericht erstellen 3/8</h1>
+ </div>
+
+ <div class ="researchReportEditor">
+ <h2 class="editor-inhalt">Literaturverzeichnis eingeben:</h2>
+ <textarea id = "editor" name="text" form="researchReportForm" rows="20" cols="100">
+ </textarea>
+ </div>
+ <div class="ResearchReportButtons">
+ <button class="researchReportButtons"><a href="researchReportQuestion.jsp">Speichern & weiter</a></button>
+ <button class="researchReportButtons"><a href="researchReportRecherche.jsp"> Zurück </a></button>
+ </div>
+ <div class="researchReportProgress">
+ <nav>
+ <menu>
+ <menuitem><a href="researchReportTitle.jsp">Titel</a> </menuitem>
+ <menuitem><a href="researchReportRecherche.jsp">Recherche</a> </menuitem>
+ <menuitem><a href="researchReportBibo.jsp"><font color="#green">Literaturverzeichnis</font></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ührung</a></menuitem>
+ <menuitem><a href="researchReportEvaluation.jsp">Evalution</a></menuitem>
+ </menu>
+ </nav>
+ </div>
+
+</form>
+
+<script>
+
+</script>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/gemeinsamforschen/src/main/webapp/pages/researchReportConcept.jsp b/gemeinsamforschen/src/main/webapp/pages/researchReportConcept.jsp
new file mode 100644
index 0000000000000000000000000000000000000000..e3329194ddd6e852c0675f67491510c48dfd0f5b
--- /dev/null
+++ b/gemeinsamforschen/src/main/webapp/pages/researchReportConcept.jsp
@@ -0,0 +1,76 @@
+<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="menu"%>
+
+<!DOCTYPE html>
+
+<html>
+<head>
+ <meta charset="utf-8">
+ <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css">
+ <link rel="stylesheet" href="../assets/css/styles.css">
+ <script src="https://cdn.jsdelivr.net/npm/inscrybmde@1.11.3/dist/inscrybmde.min.js"></script>
+ <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.3.1/jquery.min.js"></script>
+ <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js"></script>
+ <script src="../assets/js/utility.js"></script>
+ <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/inscrybmde@1.11.3/dist/inscrybmde.min.css">
+ <link rel="stylesheet" href="../assets/fonts/font-awesome.min.css">
+ <link rel="stylesheet" href="../assets/css/Community-ChatComments.css">
+ <link rel="stylesheet" href="../assets/css/Sidebar-Menu-1.css">
+ <link rel="stylesheet" href="../assets/css/Sidebar-Menu.css">
+ <link rel="stylesheet" type="text/css" href="../assets/css/researchReport.css">
+ <title>Forschungsbericht erstellen</title>
+</head>
+<body>
+
+
+
+<form id="researchReportform" class="researchReportForm" method="POST" action="../rest/researchReport/save">
+
+ <div class = "researchReportMenu">
+ <nav>
+ <menu>
+ <menuitem><p><a href="">Gruppe</a></p> </menuitem>
+ <menuitem><p><a href="">Projekt erstellen</a> </p></menuitem>
+ <menuitem><p><a href="">Forschungsbericht erstellen</a></p></menuitem>
+ <menuitem><p><a href="">Review</a></p></menuitem>
+ <menuitem><p><a href="">User</a></p></menuitem>
+ </menu>
+ </nav>
+ </div>
+
+ <div class = "researchReportTitlebar">
+ <h1> Forschungsbericht erstellen 5/8</h1>
+ </div>
+
+ <div class ="researchReportEditor">
+ <h2 class="editor-inhalt">Untersuchungskonzept eingeben:</h2>
+ <textarea id = "editor" name="text" form="researchReportForm" rows="20" cols="100">
+ </textarea>
+ </div>
+ <div class="ResearchReportButtons">
+ <button class="researchReportButtons"><a href="researchReportMethod.jsp">Speichern & weiter</a></button>
+ <button class="researchReportButtons"><a href="researchReportQuestion.jsp"> Zurück </a></button>
+ </div>
+
+ <div class="researchReportProgress">
+ <nav>
+ <menu>
+ <menuitem><a href="researchReportTitle.jsp"Titel</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"><font color="#green">Konzept</font></a></menuitem>
+ <menuitem><a href="researchReportMethod.jsp">Methodik</a></menuitem>
+ <menuitem><a href="researchReportDo.jsp">Durchführung</a></menuitem>
+ <menuitem><a href="researchReportEvaluation.jsp">Evalution</a></menuitem>
+ </menu>
+ </nav>
+ </div>
+
+</form>
+
+<script>
+
+</script>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/gemeinsamforschen/src/main/webapp/pages/researchReportDo.jsp b/gemeinsamforschen/src/main/webapp/pages/researchReportDo.jsp
new file mode 100644
index 0000000000000000000000000000000000000000..2e61fc39949c13a82749b721846dbf9b316e00f6
--- /dev/null
+++ b/gemeinsamforschen/src/main/webapp/pages/researchReportDo.jsp
@@ -0,0 +1,76 @@
+<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="menu"%>
+
+<!DOCTYPE html>
+
+<html>
+<head>
+ <meta charset="utf-8">
+ <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css">
+ <link rel="stylesheet" href="../assets/css/styles.css">
+ <script src="https://cdn.jsdelivr.net/npm/inscrybmde@1.11.3/dist/inscrybmde.min.js"></script>
+ <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.3.1/jquery.min.js"></script>
+ <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js"></script>
+ <script src="../assets/js/utility.js"></script>
+ <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/inscrybmde@1.11.3/dist/inscrybmde.min.css">
+ <link rel="stylesheet" href="../assets/fonts/font-awesome.min.css">
+ <link rel="stylesheet" href="../assets/css/Community-ChatComments.css">
+ <link rel="stylesheet" href="../assets/css/Sidebar-Menu-1.css">
+ <link rel="stylesheet" href="../assets/css/Sidebar-Menu.css">
+ <link rel="stylesheet" type="text/css" href="../assets/css/researchReport.css">
+ <title>Forschungsbericht erstellen</title>
+</head>
+<body>
+
+
+
+<form id="researchReportform" class="researchReportForm" method="POST" action="../rest/researchReport/save">
+
+ <div class = "researchReportMenu">
+ <nav>
+ <menu>
+ <menuitem><p><a href="">Gruppe</a></p> </menuitem>
+ <menuitem><p><a href="">Projekt erstellen</a> </p></menuitem>
+ <menuitem><p><a href="">Forschungsbericht erstellen</a></p></menuitem>
+ <menuitem><p><a href="">Review</a></p></menuitem>
+ <menuitem><p><a href="">User</a></p></menuitem>
+ </menu>
+ </nav>
+ </div>
+
+ <div class = "researchReportTitlebar">
+ <h1> Forschungsbericht erstellen 7/8</h1>
+ </div>
+
+ <div class ="researchReportEditor">
+ <h2 class="editor-inhalt">Durchführung eingeben:</h2>
+ <textarea id = "editor" name="text" form="researchReportForm" rows="20" cols="100">
+ </textarea>
+ </div>
+ <div class="ResearchReportButtons">
+ <button class="researchReportButtons"><a href="researchReportEvaluation.jsp">Speichern & weiter</a></button>
+ <button class="researchReportButtons"><a href="researchReportMethod.jsp"> Zurück </a></button>
+ </div>
+
+ <div class="researchReportProgress">
+ <nav>
+ <menu>
+ <menuitem><a href="researchReportTitle.jsp">Titel</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"><font color="#green">Durchführung</font></a></menuitem>
+ <menuitem><a href="researchReportEvaluation.jsp">Evalution</a></menuitem>
+ </menu>
+ </nav>
+ </div>
+
+</form>
+
+<script>
+
+</script>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/gemeinsamforschen/src/main/webapp/pages/researchReportEvaluation.jsp b/gemeinsamforschen/src/main/webapp/pages/researchReportEvaluation.jsp
new file mode 100644
index 0000000000000000000000000000000000000000..57bea8045cf358e2b2ff765f684d102b49879246
--- /dev/null
+++ b/gemeinsamforschen/src/main/webapp/pages/researchReportEvaluation.jsp
@@ -0,0 +1,76 @@
+<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="menu"%>
+
+<!DOCTYPE html>
+
+<html>
+<head>
+ <meta charset="utf-8">
+ <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css">
+ <link rel="stylesheet" href="../assets/css/styles.css">
+ <script src="https://cdn.jsdelivr.net/npm/inscrybmde@1.11.3/dist/inscrybmde.min.js"></script>
+ <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.3.1/jquery.min.js"></script>
+ <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js"></script>
+ <script src="../assets/js/utility.js"></script>
+ <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/inscrybmde@1.11.3/dist/inscrybmde.min.css">
+ <link rel="stylesheet" href="../assets/fonts/font-awesome.min.css">
+ <link rel="stylesheet" href="../assets/css/Community-ChatComments.css">
+ <link rel="stylesheet" href="../assets/css/Sidebar-Menu-1.css">
+ <link rel="stylesheet" href="../assets/css/Sidebar-Menu.css">
+ <link rel="stylesheet" type="text/css" href="../assets/css/researchReport.css">
+ <title>Forschungsbericht erstellen</title>
+</head>
+<body>
+
+
+
+<form id="researchReportform" class="researchReportForm" method="POST" action="../rest/researchReport/save">
+
+ <div class = "researchReportMenu">
+ <nav>
+ <menu>
+ <menuitem><p><a href="">Gruppe</a></p> </menuitem>
+ <menuitem><p><a href="">Projekt erstellen</a> </p></menuitem>
+ <menuitem><p><a href="">Forschungsbericht erstellen</a></p></menuitem>
+ <menuitem><p><a href="">Review</a></p></menuitem>
+ <menuitem><p><a href="">User</a></p></menuitem>
+ </menu>
+ </nav>
+ </div>
+
+ <div class = "researchReportTitlebar">
+ <h1> Forschungsbericht erstellen 8/8</h1>
+ </div>
+
+ <div class ="researchReportEditor">
+ <h2 class="editor-inhalt">Auswertung eingeben:</h2>
+ <textarea id = "editor" name="text" form="researchReportForm" rows="20" cols="100">
+ </textarea>
+ </div>
+ <div class="ResearchReportButtons">
+ <button class="researchReportButtons"><a href="project-student.jsp">Speichern & weiter</a></button>
+ <button class="researchReportButtons"><a href="researchReportDo.jsp"> Zurück </a></button>
+ </div>
+
+ <div class="researchReportProgress">
+ <nav>
+ <menu>
+ <menuitem><a href="researchReportTitle.jsp">Titel</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ührung</a></menuitem>
+ <menuitem><a href="researchReportEvaluation.jsp"><font color="#green">Evalution</font></a></menuitem>
+ </menu>
+ </nav>
+ </div>
+
+</form>
+
+<script>
+
+</script>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/gemeinsamforschen/src/main/webapp/pages/researchReportMethod.jsp b/gemeinsamforschen/src/main/webapp/pages/researchReportMethod.jsp
new file mode 100644
index 0000000000000000000000000000000000000000..cea25f4e97b9503d10ed2ddaa85ae698d6f43b01
--- /dev/null
+++ b/gemeinsamforschen/src/main/webapp/pages/researchReportMethod.jsp
@@ -0,0 +1,76 @@
+<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="menu"%>
+
+<!DOCTYPE html>
+
+<html>
+<head>
+ <meta charset="utf-8">
+ <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css">
+ <link rel="stylesheet" href="../assets/css/styles.css">
+ <script src="https://cdn.jsdelivr.net/npm/inscrybmde@1.11.3/dist/inscrybmde.min.js"></script>
+ <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.3.1/jquery.min.js"></script>
+ <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js"></script>
+ <script src="../assets/js/utility.js"></script>
+ <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/inscrybmde@1.11.3/dist/inscrybmde.min.css">
+ <link rel="stylesheet" href="../assets/fonts/font-awesome.min.css">
+ <link rel="stylesheet" href="../assets/css/Community-ChatComments.css">
+ <link rel="stylesheet" href="../assets/css/Sidebar-Menu-1.css">
+ <link rel="stylesheet" href="../assets/css/Sidebar-Menu.css">
+ <link rel="stylesheet" type="text/css" href="../assets/css/researchReport.css">
+ <title>Forschungsbericht erstellen</title>
+</head>
+<body>
+
+
+
+<form id="researchReportform" class="researchReportForm" method="POST" action="../rest/researchReport/save">
+
+ <div class = "researchReportMenu">
+ <nav>
+ <menu>
+ <menuitem><p><a href="">Gruppe</a></p> </menuitem>
+ <menuitem><p><a href="">Projekt erstellen</a> </p></menuitem>
+ <menuitem><p><a href="">Forschungsbericht erstellen</a></p></menuitem>
+ <menuitem><p><a href="">Review</a></p></menuitem>
+ <menuitem><p><a href="">User</a></p></menuitem>
+ </menu>
+ </nav>
+ </div>
+
+ <div class = "researchReportTitlebar">
+ <h1> Forschungsbericht erstellen 6/8</h1>
+ </div>
+
+ <div class ="researchReportEditor">
+ <h2 class="editor-inhalt">Methodik eingeben:</h2>
+ <textarea id = "editor" name="text" form="researchReportForm" rows="20" cols="100">
+ </textarea>
+ </div>
+ <div class="ResearchReportButtons">
+ <button class="researchReportButtons"><a href="researchReportDo.jsp">Speichern & weiter</a></button>
+ <button class="researchReportButtons"><a href="researchReportConcept.jsp"> Zurück </a></button>
+ </div>
+
+ <div class="researchReportProgress">
+ <nav>
+ <menu>
+ <menuitem><a href="researchReportTitle.jsp">Titel</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"><font color="#green">Methodik</font></a></menuitem>
+ <menuitem><a href="researchReportDo.jsp">Durchführung</a></menuitem>
+ <menuitem><a href="researchReportEvaluation.jsp">Evalution</a></menuitem>
+ </menu>
+ </nav>
+ </div>
+
+</form>
+
+<script>
+
+</script>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/gemeinsamforschen/src/main/webapp/pages/researchReportQuestion.jsp b/gemeinsamforschen/src/main/webapp/pages/researchReportQuestion.jsp
new file mode 100644
index 0000000000000000000000000000000000000000..ec485438f6b2494072e76f5dbdffca885719f771
--- /dev/null
+++ b/gemeinsamforschen/src/main/webapp/pages/researchReportQuestion.jsp
@@ -0,0 +1,75 @@
+<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="menu"%>
+
+<!DOCTYPE html>
+
+<html>
+<head>
+ <meta charset="utf-8">
+ <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css">
+ <link rel="stylesheet" href="../assets/css/styles.css">
+ <script src="https://cdn.jsdelivr.net/npm/inscrybmde@1.11.3/dist/inscrybmde.min.js"></script>
+ <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.3.1/jquery.min.js"></script>
+ <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js"></script>
+ <script src="../assets/js/utility.js"></script>
+ <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/inscrybmde@1.11.3/dist/inscrybmde.min.css">
+ <link rel="stylesheet" href="../assets/fonts/font-awesome.min.css">
+ <link rel="stylesheet" href="../assets/css/Community-ChatComments.css">
+ <link rel="stylesheet" href="../assets/css/Sidebar-Menu-1.css">
+ <link rel="stylesheet" href="../assets/css/Sidebar-Menu.css">
+ <link rel="stylesheet" type="text/css" href="../assets/css/researchReport.css">
+ <title>Forschungsbericht erstellen</title>
+</head>
+<body>
+
+
+
+
+<form id="researchReportform" class="researchReportForm" method="POST" action="../rest/researchReport/save">
+
+ <div class = "researchReportMenu">
+ <nav>
+ <menu>
+ <menuitem><p><a href="">Gruppe</a></p> </menuitem>
+ <menuitem><p><a href="">Projekt erstellen</a> </p></menuitem>
+ <menuitem><p><a href="">Forschungsbericht erstellen</a></p></menuitem>
+ <menuitem><p><a href="">Review</a></p></menuitem>
+ <menuitem><p><a href="">User</a></p></menuitem>
+ </menu>
+ </nav>
+ </div>
+
+ <div class = "researchReportTitlebar">
+ <h1> Forschungsbericht erstellen 4/8</h1>
+ </div>
+
+ <div class ="researchReportEditor">
+ <h2 class="editor-inhalt">Forschungsfrage eingeben:</h2>
+ <textarea id = "editor" name="text" form="researchReportForm" rows="10" cols="100">
+ </textarea>
+ </div>
+ <div class="ResearchReportButtons">
+ <button class="researchReportButtons"><a href="researchReportConcept.jsp">Speichern & weiter</a></button>
+ <button class="researchReportButtons"><a href="researchReportBibo.jsp"> Zurück </a></button>
+ </div>
+ <div class="researchReportProgress">
+ <nav>
+ <menu>
+ <menuitem><a href="researchReportTitle.jsp">Titel</a> </menuitem>
+ <menuitem><a href="researchReportRecherche.jsp">Recherche</a> </menuitem>
+ <menuitem><a href="researchReportBibo.jsp">Literaturverzeichnis</a> </menuitem>
+ <menuitem><a href="researchReportQuestion.jsp"><font color="#green">Forschnugsfrage</font></a> </menuitem>
+ <menuitem><a href="researchReportConcept.jsp">Konzept</a></menuitem>
+ <menuitem><a href="researchReportMethod.jsp">Methodik</a></menuitem>
+ <menuitem><a href="researchReportDo.jsp">Durchführung</a></menuitem>
+ <menuitem><a href="researchReportEvaluation.jsp">Evalution</a></menuitem>
+ </menu>
+ </nav>
+ </div>
+
+</form>
+
+<script>
+</script>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/gemeinsamforschen/src/main/webapp/pages/researchReportRecherche.jsp b/gemeinsamforschen/src/main/webapp/pages/researchReportRecherche.jsp
new file mode 100644
index 0000000000000000000000000000000000000000..e9d3d76bf7b411d6eef1e848d46bb471cc7f683e
--- /dev/null
+++ b/gemeinsamforschen/src/main/webapp/pages/researchReportRecherche.jsp
@@ -0,0 +1,75 @@
+<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="menu"%>
+
+<!DOCTYPE html>
+
+<html>
+<head>
+ <meta charset="utf-8">
+ <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css">
+ <link rel="stylesheet" href="../assets/css/styles.css">
+ <script src="https://cdn.jsdelivr.net/npm/inscrybmde@1.11.3/dist/inscrybmde.min.js"></script>
+ <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.3.1/jquery.min.js"></script>
+ <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js"></script>
+ <script src="../assets/js/utility.js"></script>
+ <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/inscrybmde@1.11.3/dist/inscrybmde.min.css">
+ <link rel="stylesheet" href="../assets/fonts/font-awesome.min.css">
+ <link rel="stylesheet" href="../assets/css/Community-ChatComments.css">
+ <link rel="stylesheet" href="../assets/css/Sidebar-Menu-1.css">
+ <link rel="stylesheet" href="../assets/css/Sidebar-Menu.css">
+ <link rel="stylesheet" type="text/css" href="../assets/css/researchReport.css">
+ <title>Forschungsbericht erstellen</title>
+</head>
+<body>
+
+
+
+<form id="researchReportform" class="researchReportForm" method="POST" action="../rest/researchReport/save">
+
+ <div class = "researchReportMenu">
+ <nav>
+ <menu>
+ <menuitem><p><a href="">Gruppe</a></p> </menuitem>
+ <menuitem><p><a href="">Projekt erstellen</a> </p></menuitem>
+ <menuitem><p><a href="">Forschungsbericht erstellen</a></p></menuitem>
+ <menuitem><p><a href="">Review</a></p></menuitem>
+ <menuitem><p><a href="">User</a></p></menuitem>
+ </menu>
+ </nav>
+ </div>
+
+ <div class = "researchReportTitlebar">
+ <h1> Forschungsbericht erstellen 2/8</h1>
+ </div>
+
+ <div class ="researchReportEditor">
+ <h2 class="editor-inhalt">Recherche eingeben:</h2>
+ <textarea id = "editor" name="text" form="researchReportForm" rows="20" cols="100">
+ </textarea>
+ </div>
+ <div class="ResearchReportButtons">
+ <button class="researchReportButtons"><a href="researchReportBibo.jsp">Speichern & weiter</a></button>
+ <button class="researchReportButtons"><a href="researchReportTitle.jsp"> Zurück </a></button>
+ </div>
+ <div class="researchReportProgress">
+ <nav>
+ <menu>
+ <menuitem><a href="researchReportTitle.jsp">Titel</a> </menuitem>
+ <menuitem><a href="researchReportRecherche.jsp"><font color="#green">Recherche</font></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ührung</a></menuitem>
+ <menuitem><a href="researchReportEvaluation.jsp">Evalution</a></menuitem>
+ </menu>
+ </nav>
+ </div>
+
+</form>
+
+<script>
+
+</script>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/gemeinsamforschen/src/main/webapp/pages/researchReportTitle.jsp b/gemeinsamforschen/src/main/webapp/pages/researchReportTitle.jsp
new file mode 100644
index 0000000000000000000000000000000000000000..a4bdcacfcc0953dcf759f6b7c13d15544cdc1259
--- /dev/null
+++ b/gemeinsamforschen/src/main/webapp/pages/researchReportTitle.jsp
@@ -0,0 +1,76 @@
+<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="menu"%>
+
+<!DOCTYPE html>
+
+<html>
+<head>
+ <meta charset="utf-8">
+ <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css">
+ <link rel="stylesheet" href="../assets/css/styles.css">
+ <script src="https://cdn.jsdelivr.net/npm/inscrybmde@1.11.3/dist/inscrybmde.min.js"></script>
+ <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.3.1/jquery.min.js"></script>
+ <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js"></script>
+ <script src="../assets/js/utility.js"></script>
+ <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/inscrybmde@1.11.3/dist/inscrybmde.min.css">
+ <link rel="stylesheet" href="../assets/fonts/font-awesome.min.css">
+ <link rel="stylesheet" href="../assets/css/Community-ChatComments.css">
+ <link rel="stylesheet" href="../assets/css/Sidebar-Menu-1.css">
+ <link rel="stylesheet" href="../assets/css/Sidebar-Menu.css">
+ <link rel="stylesheet" type="text/css" href="../assets/css/researchReport.css">
+ <title>Forschungsbericht erstellen</title>
+</head>
+<body>
+
+
+
+<form id="researchReportform" class="researchReportForm" method="POST" action="../rest/researchReport/save">
+
+ <div class = "researchReportMenu">
+ <nav>
+ <menu>
+ <menuitem><p><a href="">Gruppe</a></p> </menuitem>
+ <menuitem><p><a href="">Projekt erstellen</a> </p></menuitem>
+ <menuitem><p><a href="">Forschungsbericht erstellen</a></p></menuitem>
+ <menuitem><p><a href="">Review</a></p></menuitem>
+ <menuitem><p><a href="">User</a></p></menuitem>
+ </menu>
+ </nav>
+ </div>
+
+ <div class = "researchReportTitlebar">
+ <h1> Forschungsbericht erstellen 1/8</h1>
+ </div>
+
+ <div class ="researchReportEditor">
+ <h2 class="editor-inhalt">Titel eingeben:</h2>
+ <textarea id = "editor" name="text" form="researchReportForm" rows="20" cols="100">
+ </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ück </a></button>
+ </div>
+
+ <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ührung</a></menuitem>
+ <menuitem><a href="researchReportEvaluation.jsp">Evalution</a></menuitem>
+ </menu>
+ </nav>
+ </div>
+
+</form>
+
+<script>
+
+</script>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/gemeinsamforschen/src/main/webapp/pages/view_groupfinding_docent.html b/gemeinsamforschen/src/main/webapp/pages/view_groupfinding_docent.html
new file mode 100644
index 0000000000000000000000000000000000000000..663963e4b9500f905cb2704beddc972f7214df39
--- /dev/null
+++ b/gemeinsamforschen/src/main/webapp/pages/view_groupfinding_docent.html
@@ -0,0 +1,72 @@
+<html>
+<head>
+ <title>Gruppenfindung</title>
+
+ <script type="text/javascript" src="jquery-1.3.2.min.js"></script>
+
+</head>
+
+<body>
+
+<h1>Gruppenfindung </h1>
+
+<script type="text/javascript">
+
+ $(document).ready(function(){
+
+ $("#isSelect").click(function () {
+
+ alert($('input:radio[name=groupfinding]:checked').val());
+
+ });
+
+ $("#selectMale").click(function () {
+
+ $('input:radio[name=groupfinding]:nth(0)').attr('checked',true);
+ //$('input:radio[name=groupfinding]')[0].checked = true;
+
+ });
+
+ $("#selectFemale").click(function () {
+
+ $('input:radio[name=groupfinding]:nth(1)').attr('checked',true);
+ //$('input:radio[name=groupfinding]')[1].checked = true;
+
+ });
+
+ $("#selectUnknown").click(function () {
+
+ $('input:radio[name=groupfinding]:nth(2)').attr('checked',true);
+ //$('input:radio[name=groupfinding]')[2].checked = true;
+
+ });
+
+ $("#reset").click(function () {
+
+ $('input:radio[name=groupfinding]').attr('checked',false);
+
+ });
+
+ });
+</script>
+</head>
+<input type="text" name="coursename"> Bitte Kursname eingeben</input>
+
+<br/>
+<br/>
+<br/>
+<br/>
+
+<input type="radio" name="groupfinding" value="manual"> Manuelle Gruppenbildung</input>
+<input type="radio" name="groupfinding" value="multipleCriteria">Multiple Kriterien</input>
+<input type="radio" name="groupfinding" value="oneCriteria">Einfaches Kriterium</input>
+
+<br/>
+<br/>
+<br/>
+
+<input type='button' value='Weiter' id='isSelect'>
+
+
+</body>
+</html>
diff --git a/gemeinsamforschen/src/main/webapp/pages/view_start_groupfinding.html b/gemeinsamforschen/src/main/webapp/pages/view_start_groupfinding.html
new file mode 100644
index 0000000000000000000000000000000000000000..dff15ad7606f063b0654bb2d564e8d526e243e06
--- /dev/null
+++ b/gemeinsamforschen/src/main/webapp/pages/view_start_groupfinding.html
@@ -0,0 +1,103 @@
+<!DOCTYPE html>
+<html>
+<head>
+ <meta name="viewport" content="width=device-width, initial-scale=1">
+ <style>
+ * {
+ box-sizing: border-box;
+ }
+
+ #myInput {
+ background-image: url('/css/searchicon.png');
+ background-position: 10px 12px;
+ background-repeat: no-repeat;
+ width: 100%;
+ font-size: 16px;
+ padding: 12px 20px 12px 40px;
+ border: 1px solid #ddd;
+ margin-bottom: 12px;
+ }
+
+ #myUL {
+ list-style-type: none;
+ padding: 0;
+ margin: 0;
+ }
+
+ #myUL li a {
+ border: 1px solid #ddd;
+ margin-top: -1px; /* Prevent double borders */
+ background-color: #f6f6f6;
+ padding: 12px;
+ text-decoration: none;
+ font-size: 18px;
+ color: black;
+ display: block
+ }
+
+ #myUL li a:hover:not(.header) {
+ background-color: #eee;
+ }
+
+ </style>
+</head>
+<br>
+
+<h2>Angemeldete Studenten</h2>
+
+</br>
+
+
+
+<p align="left"><u><font color="#FF0000" size="+2">Kriterienbasierte Gruppenbildung</font></u></p>
+<input type="button" value="Ändern">
+</br>
+</br>
+</br>
+
+<input type="text" id="myInput" onkeyup="myFunction()" placeholder="Search for names.." title="Type in a name">
+
+<ul id="myUL">
+ <li><a href="#">Adele</a></li>
+ <li><a href="#">Agnes</a></li>
+
+ <li><a href="#">Billy</a></li>
+ <li><a href="#">Bob</a></li>
+
+ <li><a href="#">Calvin</a></li>
+ <li><a href="#">Hannes</a></li>
+ <li><a href="#">Zapano</a></li>
+</ul>
+
+
+
+</br>
+</br>
+</br>
+
+<input type="button" value="Gruppenbildung starten">
+
+
+<script>
+ function myFunction() {
+ var input, filter, ul, li, a, i;
+ input = document.getElementById("myInput");
+ filter = input.value.toUpperCase();
+ ul = document.getElementById("myUL");
+ li = ul.getElementsByTagName("li");
+ for (i = 0; i < li.length; i++) {
+ a = li[i].getElementsByTagName("a")[0];
+ if (a.innerHTML.toUpperCase().indexOf(filter) > -1) {
+ li[i].style.display = "";
+ } else {
+ li[i].style.display = "none";
+
+ }
+ }
+ }
+
+
+</script>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/gemeinsamforschen/src/main/webapp/pages/view_student_criteriachoice.html b/gemeinsamforschen/src/main/webapp/pages/view_student_criteriachoice.html
new file mode 100644
index 0000000000000000000000000000000000000000..82b12aa7aa570a7f224c903fb27c5974678b663b
--- /dev/null
+++ b/gemeinsamforschen/src/main/webapp/pages/view_student_criteriachoice.html
@@ -0,0 +1,100 @@
+<!DOCTYPE html>
+<html>
+<meta http-equiv="content-type" content="text/html; charset=utf-8">
+<head>
+ <title> Auswahl der Kriterien für Studenten</title>
+ <meta name="viewport" content="width=device-width, initial-scale=1">
+ <script src="https://unpkg.com/jquery"></script>
+ <script src="https://surveyjs.azureedge.net/1.0.29/survey.jquery.js"></script>
+ <link href="https://surveyjs.azureedge.net/1.0.29/survey.css" type="text/css" rel="stylesheet"/>
+ <link rel="stylesheet" href="./index.css">
+
+</head>
+<br>
+<h2>Auswahl der Kriterien für Studenten</h2>
+
+
+<div id="surveyElement"></div>
+<div id="surveyResult"></div>
+
+
+
+<script type="text/javascript" >
+ Survey
+ .StylesManager
+ .applyTheme("default");
+
+ var json = {
+ pages: [
+ {
+ questions: [
+ {
+ type: "matrix",
+ name: "Quality",
+ title: "Bitte markiere wie stark die einzelnen Punkte auf Dich zutreffen",
+ columns: [
+ {
+ value: 1,
+ text: 1
+ }, {
+ value: 2,
+ text: 2
+ }, {
+ value: 3,
+ text: 3
+ }, {
+ value: 4,
+ text: 4
+ }, {
+ value: 5,
+ text: 5
+ },
+
+ ],
+ rows: [
+ {
+ value: "affordable",
+ text: "Ich kann mich selbst so organisieren, dass ich alle Deadlines einhalten kann"
+ }, {
+ value: "does what it claims",
+ text: "Kurz nach der Vorlesung kann ich mich an den Kernstoff erinnern"
+ }, {
+ value: "better then others",
+ text: "Ich kann die meisten Schlüsselkompetenzen verstehen die meinen Kurs betreffen"
+ }, {
+ value: "easy to use",
+ text: "Ich kann mich gut selbst organisieren"
+ }
+ ]
+ }, {
+ type: "rating",
+ name: "satisfaction",
+ title: "Wie zufrieden sind Sie mit Ihrer eigenen Arbeit",
+ mininumRateDescription: "Nicht zufrieden",
+ maximumRateDescription: "Komplett zufrieden"
+ },
+ ]
+ },
+ ]
+ };
+
+ window.survey = new Survey.Model(json);
+
+ survey
+ .onComplete
+ .add(function (result) {
+ document
+ .querySelector('#surveyResult')
+ //.innerHTML = "result: " + JSON.stringify(result.data);
+ });
+
+ $("#surveyElement").Survey({model: survey});
+
+
+
+
+
+</script>
+
+</body>
+</html>
diff --git a/gemeinsamforschen/src/scripts/dbschema/createDummyResearchReport.sql b/gemeinsamforschen/src/scripts/dbschema/createDummyResearchReport.sql
new file mode 100644
index 0000000000000000000000000000000000000000..dc22bfce45c061b650d49ea03d730dc83085a5a7
--- /dev/null
+++ b/gemeinsamforschen/src/scripts/dbschema/createDummyResearchReport.sql
@@ -0,0 +1,26 @@
+drop TABLE `researchReport`;
+
+CREATE TABLE researchReport (
+ `id` varchar(400) NOT NULL,
+ `author` varchar(400) NOT NULL,
+ `title` varchar(400) NOT NULL,
+ `method` varchar(10000) NOT NULL,
+ `research` varchar(10000) NOT NULL,
+ `researchResult` varchar(10000) NOT NULL,
+ `evaluation` varchar(10000) NOT NULL,
+)ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+INSERT INTO researchReport (`id`, `author`, `title`, `method`, `research`, `researchResult`, `evaluation`) VALUES
+ ('id1', 'author1', 'title1', 'method1', 'research1', 'researchResult1', 'evaluation1');
+
+INSERT INTO researchReport (`id`, `author`, `title`, `method`, `research`, `researchResult`, `evaluation`) VALUES
+ ('id2', 'author2', 'title2', 'method2', 'research2', 'researchResult2', 'evaluation2');
+
+INSERT INTO researchReport (`id`, `author`, `title`, `method`, `research`, `researchResult`, `evaluation`) VALUES
+ ('id3', 'author3', 'title3', 'method3', 'research3', 'researchResult3', 'evaluation3');
+
+INSERT INTO researchReport (`id`, `author`, `title`, `method`, `research`, `researchResult`, `evaluation`) VALUES
+ ('id4', 'author4', 'title4', 'method4', 'research4', 'researchResult4', 'evaluation4');
+
+INSERT INTO researchReport (`id`, `author`, `title`, `method`, `research`, `researchResult`, `evaluation`) VALUES
+ ('id5', 'author5', 'title5', 'method5', 'research5', 'researchResult5', 'evaluation5');
\ No newline at end of file
diff --git a/gemeinsamforschen/src/scripts/dbschema/fltrail.sql b/gemeinsamforschen/src/scripts/dbschema/fltrail.sql
index 717dbcde085d2926a7c2abd9963a752edcdddd96..1a26a6ff3015512e0d23e0f012e1409cbf7b6136 100644
--- a/gemeinsamforschen/src/scripts/dbschema/fltrail.sql
+++ b/gemeinsamforschen/src/scripts/dbschema/fltrail.sql
@@ -1,88 +1,83 @@
-CREATE DATABASE IF NOT EXISTS `fltrail`
- DEFAULT CHARACTER SET utf8
- COLLATE utf8_general_ci;
+SET SQL_MODE = "NO_AUTO_VALUE_ON_ZERO";
+SET time_zone = "+00:00";
+
+/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
+/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
+/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */;
+/*!40101 SET NAMES utf8mb4 */;
+
+CREATE DATABASE IF NOT EXISTS `fltrail` DEFAULT CHARACTER SET utf8 COLLATE utf8_general_ci;
USE `fltrail`;
-CREATE TABLE if not exists `projects` (
- `id` varchar(400) NOT NULL,
- `password` varchar(400) NOT NULL,
- `active` tinyint(1) NOT NULL,
- `timecreated` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP
- ON UPDATE CURRENT_TIMESTAMP,
- `author` varchar(400) NOT NULL,
- `adminPassword` varchar(400) NOT NULL,
- `token` varchar(400) NOT NULL
-)
- ENGINE = InnoDB
- DEFAULT CHARSET = utf8;
-
-
-CREATE TABLE if not exists `groups` (
- `id` int NOT NULL AUTO_INCREMENT,
- `projectId` varchar(400) NOT NULL,
- `chatRoomId` varchar(400) NOT NULL,
- PRIMARY KEY (id)
-)
- ENGINE = InnoDB
- DEFAULT CHARSET = utf8;
-
-CREATE TABLE if not exists groupuser
-(
- userEmail varchar(400) NOT NULL,
- groupId int NOT NULL
-)
- ENGINE = InnoDB
- DEFAULT CHARSET = utf8;
-
-CREATE TABLE if not exists `tags` (
+CREATE TABLE `projects` (
+ `id` varchar(400) NOT NULL,
+ `password` varchar(400) NOT NULL,
+ `activ` tinyint(1) NOT NULL,
+ `timecreated` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+ `author` varchar(400) NOT NULL,
+ `adminpassword` varchar(400) NOT NULL,
+ `token` varchar(400) NOT NULL
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+CREATE TABLE `tags` (
`projectId` varchar(400) NOT NULL,
- `tag` varchar(400) NOT NULL
-)
- ENGINE = InnoDB
- DEFAULT CHARSET = utf8;
-
-CREATE TABLE if not exists `users` (
- `name` varchar(400) NOT NULL,
- `password` varchar(200) NOT NULL,
- `email` varchar(255) NOT NULL,
- `token` varchar(800) NOT NULL,
- `rocketChatId` varchar(400) NOT NULL,
- `rocketChatAuthToken` varchar(800) NOT NULL,
- UNIQUE (email)
-)
- ENGINE = InnoDB
- DEFAULT CHARSET = utf8;
-
-CREATE TABLE if not exists projectuser
-(
- projectId varchar(400) NOT NULL,
- userId varchar(400) NOT NULL
-)
- 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`)
+ `tag` varchar(400) NOT NULL
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+CREATE TABLE `users` (
+ `name` varchar(400) NOT NULL,
+ `password` varchar(200) NOT NULL,
+ `email` varchar(400) NOT NULL,
+ `token` varchar(800) NOT NULL
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+CREATE TABLE projectuser
+ (
+ projectId varchar(400) NOT NULL,
+ userId varchar(400) NOT NULL
+); ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
alter table users
add isStudent tinyint(1) default '1' null;
-CREATE TABLE if not exists quiz
-(
- author varchar(400) NOT NULL,
- projectId varchar(400) NOT NULL,
- question varchar(400) NOT NULL,
- mcType varchar(400) NOT NULL,
- answer varchar(400) NOT NULL,
- correct tinyint(1) NOT NULL
-)
- ENGINE = InnoDB
- DEFAULT CHARSET = utf8;
\ No newline at end of file
+CREATE TABLE researchReport (
+ `id` varchar(400) NOT NULL,
+ `author` varchar(400) NOT NULL,
+ `title` varchar(400) NOT NULL,
+ `method` varchar(10000) NOT NULL,
+ `research` varchar(10000) NOT NULL,
+ `researchResult` varchar(10000) NOT NULL,
+ `evaluation` varchar(10000) NOT NULL,
+)ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+//ToDo
+CREATE TABLE timeplan(
+ `reportID` varchar(400) NOT NULL,
+ `startingTime` datetime NOT NULL,
+ `endTIme` datetime NOT NULL,
+ `milestoneTime` datetime NOT NULL,
+)ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+CREATE TABLE researchQuestion(
+ `reportID` varchar(400) NOT NULL,
+ `question` varchar(4000) NOT NULL,
+)ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+CREATE TABLE bibliography(
+ `reportID` varchar(400) NOT NULL,
+ `primarySource` varchar(4000) NOT NULL,
+ `secondarySource` varchar(4000) NOT NULL,
+)ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+CREATE TABLE learningGoals(
+ `reportID` varchar(400) NOT NULL,
+ `goal` varchar(4000) NOT NULL,
+)ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+
+
+
+
+/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
+/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
+/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
diff --git a/gemeinsamforschen/src/test/java/unipotsdam/gf/modules/researchreports/ResearchReportTest.java b/gemeinsamforschen/src/test/java/unipotsdam/gf/modules/researchreports/ResearchReportTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..52a96f7d3c9488314fd70bf4a7cf54af7b8ca6f0
--- /dev/null
+++ b/gemeinsamforschen/src/test/java/unipotsdam/gf/modules/researchreports/ResearchReportTest.java
@@ -0,0 +1,27 @@
+/* package unipotsdam.gf.modules.researchreports;
+
+
+
+
+import com.sun.org.apache.xerces.internal.xs.LSInputList;
+import org.junit.Test;
+import org.w3c.dom.ls.LSInput;
+import unipotsdam.gf.modules.researchreport.ResearchReport;
+
+import java.util.*;
+
+public class ResearchReportTest {
+
+ @Test
+ public void egal() {
+ System.out.print("hello world");
+ List<ResearchReport> researchReportList = new ArrayList<ResearchReport>();
+ List<ResearchReport> researchReportList2 = new LinkedList<>();
+
+ for (ResearchReport researchReport : researchReportList2) {
+ System.out.print(researchReport.getTitle());
+ }
+
+ }
+}
+*/
\ No newline at end of file