Skip to content
Snippets Groups Projects
Commit fcc5063c authored by quark's avatar quark
Browse files

Merge branch 'researchreport' into pages_overview 

# Conflicts:
#	gemeinsamforschen/src/scripts/dbschema/fltrail.sql
parents 5bd2a84d dac84bc0
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 975 additions and 84 deletions
gemeinsamforschen/src/main/java/unipotsdam/gf/interfaces/ResearchReports.java 0 → 100644
+ 8
− 0
View file @ fcc5063c
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);
}
gemeinsamforschen/src/main/java/unipotsdam/gf/modules/researchreport/Bibliography.java 0 → 100644
+ 4
− 0
View file @ fcc5063c
package unipotsdam.gf.modules.researchreport;
public class Bibliography {
}
gemeinsamforschen/src/main/java/unipotsdam/gf/modules/researchreport/ResearchQuestion.java 0 → 100644
+ 4
− 0
View file @ fcc5063c
package unipotsdam.gf.modules.researchreport;
public class ResearchQuestion {
}
gemeinsamforschen/src/main/java/unipotsdam/gf/modules/researchreport/ResearchReport.java 0 → 100644
+ 110
− 0
View file @ fcc5063c
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;
}
}
gemeinsamforschen/src/main/java/unipotsdam/gf/interfaces/ResearchReport.java → gemeinsamforschen/src/main/java/unipotsdam/gf/modules/researchreport/ResearchReportManagement.java
+ 4
− 4
View file @ fcc5063c
package unipotsdam.gf.interfaces; package unipotsdam.gf.modules.researchreport;
import java.io.File; import unipotsdam.gf.modules.researchreport.ResearchReport;
import java.io.File; import java.io.File;
...@@ -9,7 +9,7 @@ import java.io.File; ...@@ -9,7 +9,7 @@ import java.io.File;
*/ */
public interface ResearchReport { public interface ResearchReportManagement {
/** /**
* Create a File * Create a File
...@@ -17,7 +17,7 @@ public interface ResearchReport { ...@@ -17,7 +17,7 @@ public interface ResearchReport {
* @param researchReport Name of the Report * @param researchReport Name of the Report
* @return Returns the reportId * @return Returns the reportId
*/ */
String createReseachReport(ResearchReport researchReport); String createResearchReport(ResearchReport researchReport);
/** /**
......
gemeinsamforschen/src/main/java/unipotsdam/gf/modules/researchreport/Timeplanning.java 0 → 100644
+ 4
− 0
View file @ fcc5063c
package unipotsdam.gf.modules.researchreport;
public class Timeplanning {
}
gemeinsamforschen/src/main/webapp/assets/css/researchReport.css 0 → 100644
+ 182
− 0
View file @ fcc5063c
/*
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;
}
gemeinsamforschen/src/main/webapp/pages/researchReportBibo.html 0 → 100644
+ 66
− 0
View file @ fcc5063c
<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&uuml;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&uuml;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
gemeinsamforschen/src/main/webapp/pages/researchReportConcept.html 0 → 100644
+ 67
− 0
View file @ fcc5063c
<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&uuml;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&uuml;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
gemeinsamforschen/src/main/webapp/pages/researchReportDo.html 0 → 100644
+ 67
− 0
View file @ fcc5063c
<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&uuml;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&uuml;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&uuml;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
gemeinsamforschen/src/main/webapp/pages/researchReportEvaluation.html 0 → 100644
+ 67
− 0
View file @ fcc5063c
<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&uuml;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&uuml;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
gemeinsamforschen/src/main/webapp/pages/researchReportMethod.html 0 → 100644
+ 67
− 0
View file @ fcc5063c
<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&uuml;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&uuml;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
gemeinsamforschen/src/main/webapp/pages/researchReportQuestion.html 0 → 100644
+ 64
− 0
View file @ fcc5063c
<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&uuml;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&uuml;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
gemeinsamforschen/src/main/webapp/pages/researchReportRecherche.html 0 → 100644
+ 66
− 0
View file @ fcc5063c
<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&uuml;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&uuml;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
gemeinsamforschen/src/main/webapp/pages/researchReportTitle.html 0 → 100644
+ 67
− 0
View file @ fcc5063c
<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&uuml;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&uuml;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
gemeinsamforschen/src/scripts/dbschema/createDummyResearchReport.sql 0 → 100644
+ 26
− 0
View file @ fcc5063c
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
gemeinsamforschen/src/scripts/dbschema/fltrail.sql
+ 75
− 80
View file @ fcc5063c
CREATE DATABASE IF NOT EXISTS `fltrail` SET SQL_MODE = "NO_AUTO_VALUE_ON_ZERO";
DEFAULT CHARACTER SET utf8 SET time_zone = "+00:00";
COLLATE utf8_general_ci;
/*!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`; USE `fltrail`;
CREATE TABLE if not exists `projects` ( CREATE TABLE `projects` (
`id` varchar(400) NOT NULL, `id` varchar(400) NOT NULL,
`password` varchar(400) NOT NULL, `password` varchar(400) NOT NULL,
`active` tinyint(1) NOT NULL, `activ` tinyint(1) NOT NULL,
`timecreated` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP `timecreated` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
ON UPDATE CURRENT_TIMESTAMP, `author` varchar(400) NOT NULL,
`author` varchar(400) NOT NULL, `adminpassword` varchar(400) NOT NULL,
`adminPassword` varchar(400) NOT NULL, `token` varchar(400) NOT NULL
`token` varchar(400) NOT NULL ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
)
ENGINE = InnoDB CREATE TABLE `tags` (
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` (
`projectId` varchar(400) NOT NULL, `projectId` varchar(400) NOT NULL,
`tag` 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`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8; ) 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 alter table users
add isStudent tinyint(1) default '1' null; add isStudent tinyint(1) default '1' null;
CREATE TABLE if not exists quiz CREATE TABLE researchReport (
( `id` varchar(400) NOT NULL,
author varchar(400) NOT NULL, `author` varchar(400) NOT NULL,
projectId varchar(400) NOT NULL, `title` varchar(400) NOT NULL,
question varchar(400) NOT NULL, `method` varchar(10000) NOT NULL,
mcType varchar(400) NOT NULL, `research` varchar(10000) NOT NULL,
answer varchar(400) NOT NULL, `researchResult` varchar(10000) NOT NULL,
correct tinyint(1) NOT NULL `evaluation` varchar(10000) NOT NULL,
) )ENGINE=InnoDB DEFAULT CHARSET=utf8;
ENGINE = InnoDB
DEFAULT CHARSET = utf8; //ToDo
\ No newline at end of file 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 */;
gemeinsamforschen/src/test/java/unipotsdam/gf/modules/researchreports/ResearchReportTest.java 0 → 100644
+ 27
− 0
View file @ fcc5063c
/* 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
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment