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..57b2a0324b1bdcb26a5e4eb3d2528dd63b9e2f31
--- /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.html b/gemeinsamforschen/src/main/webapp/pages/researchReportBibo.html
new file mode 100644
index 0000000000000000000000000000000000000000..2cd1286395c23d9cb7bcb69b07f3a0866b5d1607
--- /dev/null
+++ b/gemeinsamforschen/src/main/webapp/pages/researchReportBibo.html
@@ -0,0 +1,66 @@
+
+<html>
+<head>
+ <meta charset="utf-8">
+ <script src="https://cdn.jsdelivr.net/npm/inscrybmde@1.11.3/dist/inscrybmde.min.js"></script>
+ <link rel="stylesheet" type="text/css" href="../assets/css/researchReport.css">
+ <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/inscrybmde@1.11.3/dist/inscrybmde.min.css">
+ <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.3.1/jquery.min.js"></script>
+ <script src="../assets/js/utility.js"></script>
+ <script src="../assets/js/Sidebar-Menu.js"></script>
+ <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.html">Speichern & weiter</a></button>
+ <button class="researchReportButtons"><a href="researchReportRecherche.html"> Zurück </a></button>
+ </div>
+ <div class="researchReportProgress">
+ <nav>
+ <menu>
+ <menuitem><a href="researchReportTitle.html">Titel</a> </menuitem>
+ <menuitem><a href="researchReportRecherche.html">Recherche</a> </menuitem>
+ <menuitem><a href="researchReportBibo.html"><font color="#green">Literaturverzeichnis</font></a> </menuitem>
+ <menuitem><a href="researchReportQuestion.html">Forschnugsfrage</a> </menuitem>
+ <menuitem><a href="researchReportConcept.html">Konzept</a></menuitem>
+ <menuitem><a href="researchReportMethod.html">Methodik</a></menuitem>
+ <menuitem><a href="researchReportDo.html">Durchführung</a></menuitem>
+ <menuitem><a href="researchReportEvaluation.html">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.html b/gemeinsamforschen/src/main/webapp/pages/researchReportConcept.html
new file mode 100644
index 0000000000000000000000000000000000000000..74965ff344d2b9d1c3bd9a204f61cbd874f7df7f
--- /dev/null
+++ b/gemeinsamforschen/src/main/webapp/pages/researchReportConcept.html
@@ -0,0 +1,67 @@
+
+<html>
+<head>
+ <meta charset="utf-8">
+ <script src="https://cdn.jsdelivr.net/npm/inscrybmde@1.11.3/dist/inscrybmde.min.js"></script>
+ <link rel="stylesheet" type="text/css" href="../assets/css/researchReport.css">
+ <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/inscrybmde@1.11.3/dist/inscrybmde.min.css">
+ <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.3.1/jquery.min.js"></script>
+ <script src="../assets/js/utility.js"></script>
+ <script src="../assets/js/Sidebar-Menu.js"></script>
+ <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.html">Speichern & weiter</a></button>
+ <button class="researchReportButtons"><a href="researchReportQuestion.html"> Zurück </a></button>
+ </div>
+
+ <div class="researchReportProgress">
+ <nav>
+ <menu>
+ <menuitem><a href="researchReportTitle.html"Titel</a> </menuitem>
+ <menuitem><a href="researchReportRecherche.html">Recherche</a> </menuitem>
+ <menuitem><a href="researchReportBibo.html">Literaturverzeichnis</a> </menuitem>
+ <menuitem><a href="researchReportQuestion.html">Forschnugsfrage</a> </menuitem>
+ <menuitem><a href="researchReportConcept.html"><font color="#green">Konzept</font></a></menuitem>
+ <menuitem><a href="researchReportMethod.html">Methodik</a></menuitem>
+ <menuitem><a href="researchReportDo.html">Durchführung</a></menuitem>
+ <menuitem><a href="researchReportEvaluation.html">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.html b/gemeinsamforschen/src/main/webapp/pages/researchReportDo.html
new file mode 100644
index 0000000000000000000000000000000000000000..a2a31eaf5a15425e476aad89cc00ef79361df389
--- /dev/null
+++ b/gemeinsamforschen/src/main/webapp/pages/researchReportDo.html
@@ -0,0 +1,67 @@
+
+<html>
+<head>
+ <meta charset="utf-8">
+ <script src="https://cdn.jsdelivr.net/npm/inscrybmde@1.11.3/dist/inscrybmde.min.js"></script>
+ <link rel="stylesheet" type="text/css" href="../assets/css/researchReport.css">
+ <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/inscrybmde@1.11.3/dist/inscrybmde.min.css">
+ <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.3.1/jquery.min.js"></script>
+ <script src="../assets/js/utility.js"></script>
+ <script src="../assets/js/Sidebar-Menu.js"></script>
+ <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="project-student.jsp">Speichern & weiter</a></button>
+ <button class="researchReportButtons"><a href="researchReportMethod.html"> Zurück </a></button>
+ </div>
+
+ <div class="researchReportProgress">
+ <nav>
+ <menu>
+ <menuitem><a href="researchReportTitle.html">Titel</a> </menuitem>
+ <menuitem><a href="researchReportRecherche.html">Recherche</a> </menuitem>
+ <menuitem><a href="researchReportBibo.html">Literaturverzeichnis</a> </menuitem>
+ <menuitem><a href="researchReportQuestion.html">Forschnugsfrage</a> </menuitem>
+ <menuitem><a href="researchReportConcept.html">Konzept</a></menuitem>
+ <menuitem><a href="researchReportMethod.html">Methodik</a></menuitem>
+ <menuitem><a href="researchReportDo.html"><font color="#green">Durchführung</font></a></menuitem>
+ <menuitem><a href="researchReportEvaluation.html">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.html b/gemeinsamforschen/src/main/webapp/pages/researchReportEvaluation.html
new file mode 100644
index 0000000000000000000000000000000000000000..f91937c4279ccf599930e71d480da9e1a981279f
--- /dev/null
+++ b/gemeinsamforschen/src/main/webapp/pages/researchReportEvaluation.html
@@ -0,0 +1,67 @@
+
+<html>
+<head>
+ <meta charset="utf-8">
+ <script src="https://cdn.jsdelivr.net/npm/inscrybmde@1.11.3/dist/inscrybmde.min.js"></script>
+ <link rel="stylesheet" type="text/css" href="../assets/css/researchReport.css">
+ <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/inscrybmde@1.11.3/dist/inscrybmde.min.css">
+ <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.3.1/jquery.min.js"></script>
+ <script src="../assets/js/utility.js"></script>
+ <script src="../assets/js/Sidebar-Menu.js"></script>
+ <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="researchReportEvaluation.html">Speichern & weiter</a></button>
+ <button class="researchReportButtons"><a href="researchReportDo.html"> Zurück </a></button>
+ </div>
+
+ <div class="researchReportProgress">
+ <nav>
+ <menu>
+ <menuitem><a href="researchReportTitle.html">Titel</a> </menuitem>
+ <menuitem><a href="researchReportRecherche.html">Recherche</a> </menuitem>
+ <menuitem><a href="researchReportBibo.html">Literaturverzeichnis</a> </menuitem>
+ <menuitem><a href="researchReportQuestion.html">Forschnugsfrage</a> </menuitem>
+ <menuitem><a href="researchReportConcept.html">Konzept</a></menuitem>
+ <menuitem><a href="researchReportMethod.html">Methodik</a></menuitem>
+ <menuitem><a href="researchReportDo.html">Durchführung</a></menuitem>
+ <menuitem><a href="researchReportEvaluation.html"><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.html b/gemeinsamforschen/src/main/webapp/pages/researchReportMethod.html
new file mode 100644
index 0000000000000000000000000000000000000000..75cc1d2e50e73e12f4ac711b2264405c4a665275
--- /dev/null
+++ b/gemeinsamforschen/src/main/webapp/pages/researchReportMethod.html
@@ -0,0 +1,67 @@
+
+<html>
+<head>
+ <meta charset="utf-8">
+ <script src="https://cdn.jsdelivr.net/npm/inscrybmde@1.11.3/dist/inscrybmde.min.js"></script>
+ <link rel="stylesheet" type="text/css" href="../assets/css/researchReport.css">
+ <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/inscrybmde@1.11.3/dist/inscrybmde.min.css">
+ <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.3.1/jquery.min.js"></script>
+ <script src="../assets/js/utility.js"></script>
+ <script src="../assets/js/Sidebar-Menu.js"></script>
+ <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.html">Speichern & weiter</a></button>
+ <button class="researchReportButtons"><a href="researchReportConcept.html"> Zurück </a></button>
+ </div>
+
+ <div class="researchReportProgress">
+ <nav>
+ <menu>
+ <menuitem><a href="researchReportTitle.html">Titel</a> </menuitem>
+ <menuitem><a href="researchReportRecherche.html">Recherche</a> </menuitem>
+ <menuitem><a href="researchReportBibo.html">Literaturverzeichnis</a> </menuitem>
+ <menuitem><a href="researchReportQuestion.html">Forschnugsfrage</a> </menuitem>
+ <menuitem><a href="researchReportConcept.html">Konzept</a></menuitem>
+ <menuitem><a href="researchReportMethod.html"><font color="#green">Methodik</font></a></menuitem>
+ <menuitem><a href="researchReportDo.html">Durchführung</a></menuitem>
+ <menuitem><a href="researchReportEvaluation.html">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.html b/gemeinsamforschen/src/main/webapp/pages/researchReportQuestion.html
new file mode 100644
index 0000000000000000000000000000000000000000..c222f4f9f158eb17ec97a3f62f37abc4a2c821b1
--- /dev/null
+++ b/gemeinsamforschen/src/main/webapp/pages/researchReportQuestion.html
@@ -0,0 +1,64 @@
+<html>
+<head>
+ <meta charset="utf-8">
+ <script src="https://cdn.jsdelivr.net/npm/inscrybmde@1.11.3/dist/inscrybmde.min.js"></script>
+ <link rel="stylesheet" type="text/css" href="../assets/css/researchReport.css">
+ <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/inscrybmde@1.11.3/dist/inscrybmde.min.css">
+ <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.3.1/jquery.min.js"></script>
+ <script src="../assets/js/utility.js"></script>
+ <script src="../assets/js/Sidebar-Menu.js"></script>
+ <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.html">Speichern & weiter</a></button>
+ <button class="researchReportButtons"><a href="researchReportBibo.html"> Zurück </a></button>
+ </div>
+ <div class="researchReportProgress">
+ <nav>
+ <menu>
+ <menuitem><a href="researchReportTitle.html">Titel</a> </menuitem>
+ <menuitem><a href="researchReportRecherche.html">Recherche</a> </menuitem>
+ <menuitem><a href="researchReportBibo.html">Literaturverzeichnis</a> </menuitem>
+ <menuitem><a href="researchReportQuestion.html"><font color="#green">Forschnugsfrage</font></a> </menuitem>
+ <menuitem><a href="researchReportConcept.html">Konzept</a></menuitem>
+ <menuitem><a href="researchReportMethod.html">Methodik</a></menuitem>
+ <menuitem><a href="researchReportDo.html">Durchführung</a></menuitem>
+ <menuitem><a href="researchReportEvaluation.html">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.html b/gemeinsamforschen/src/main/webapp/pages/researchReportRecherche.html
new file mode 100644
index 0000000000000000000000000000000000000000..67a50db7e325562e4df672fc6c3e95e653f61b14
--- /dev/null
+++ b/gemeinsamforschen/src/main/webapp/pages/researchReportRecherche.html
@@ -0,0 +1,66 @@
+
+<html>
+<head>
+ <meta charset="utf-8">
+ <script src="https://cdn.jsdelivr.net/npm/inscrybmde@1.11.3/dist/inscrybmde.min.js"></script>
+ <link rel="stylesheet" type="text/css" href="../assets/css/researchReport.css">
+ <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/inscrybmde@1.11.3/dist/inscrybmde.min.css">
+ <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.3.1/jquery.min.js"></script>
+ <script src="../assets/js/utility.js"></script>
+ <script src="../assets/js/Sidebar-Menu.js"></script>
+ <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.html">Speichern & weiter</a></button>
+ <button class="researchReportButtons"><a href="researchReportTitle.html"> Zurück </a></button>
+ </div>
+ <div class="researchReportProgress">
+ <nav>
+ <menu>
+ <menuitem><a href="researchReportTitle.html">Titel</a> </menuitem>
+ <menuitem><a href="researchReportRecherche.html"><font color="#green">Recherche</font></a> </menuitem>
+ <menuitem><a href="researchReportBibo.html">Literaturverzeichnis</a> </menuitem>
+ <menuitem><a href="researchReportQuestion.html">Forschnugsfrage</a> </menuitem>
+ <menuitem><a href="researchReportConcept.html">Konzept</a></menuitem>
+ <menuitem><a href="researchReportMethod.html">Methodik</a></menuitem>
+ <menuitem><a href="researchReportDo.html">Durchführung</a></menuitem>
+ <menuitem><a href="researchReportEvaluation.html">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.html b/gemeinsamforschen/src/main/webapp/pages/researchReportTitle.html
new file mode 100644
index 0000000000000000000000000000000000000000..9819f35f735bc296e1763341b5616b5b2c615708
--- /dev/null
+++ b/gemeinsamforschen/src/main/webapp/pages/researchReportTitle.html
@@ -0,0 +1,67 @@
+
+<html>
+<head>
+ <meta charset="utf-8">
+ <script src="https://cdn.jsdelivr.net/npm/inscrybmde@1.11.3/dist/inscrybmde.min.js"></script>
+ <link rel="stylesheet" type="text/css" href="../assets/css/researchReport.css">
+ <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/inscrybmde@1.11.3/dist/inscrybmde.min.css">
+ <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.3.1/jquery.min.js"></script>
+ <script src="../assets/js/utility.js"></script>
+ <script src="../assets/js/Sidebar-Menu.js"></script>
+ <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.html">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.html"><font color="#green">Titel</font></a> </menuitem>
+ <menuitem><a href="researchReportRecherche.html">Recherche</a> </menuitem>
+ <menuitem><a href="researchReportBibo.html">Literaturverzeichnis</a> </menuitem>
+ <menuitem><a href="researchReportQuestion.html">Forschnugsfrage</a> </menuitem>
+ <menuitem><a href="researchReportConcept.html">Konzept</a></menuitem>
+ <menuitem><a href="researchReportMethod.html">Methodik</a></menuitem>
+ <menuitem><a href="researchReportDo.html">Durchführung</a></menuitem>
+ <menuitem><a href="researchReportEvaluation.html">Evalution</a></menuitem>
+ </menu>
+ </nav>
+ </div>
+
+</form>
+
+<script>
+
+</script>
+
+</body>
+</html>
\ No newline at end of file
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