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
new file mode 100644
index 0000000000000000000000000000000000000000..2c8ef86655468bdb480a69bdf52f9c8c8d24324c
--- /dev/null
+++ b/gemeinsamforschen/src/main/java/unipotsdam/gf/core/management/user/Menu.java
@@ -0,0 +1,67 @@
+package unipotsdam.gf.core.management.user;
+
+import unipotsdam.gf.core.management.ManagementImpl;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.jsp.JspException;
+import javax.servlet.jsp.JspWriter;
+import javax.servlet.jsp.PageContext;
+import javax.servlet.jsp.tagext.SimpleTagSupport;
+import java.io.IOException;
+
+
+// TODO: please move this to a view package at the top of the hierarchy as this is not part of the user package
+public class Menu extends SimpleTagSupport {
+ public void doTag() throws JspException, IOException {
+ PageContext pageContext = (PageContext) getJspContext();
+ HttpServletRequest request = (HttpServletRequest) pageContext.getRequest();
+ String token = request.getParameter("token");
+ String projectId = request.getParameter("projectId");
+ ManagementImpl management = new ManagementImpl();
+ JspWriter out = getJspContext().getOut();
+ if (token!=null){
+ User user = management.getUserByToken(token);
+ Boolean isStudent = user.getStudent();
+ if (isStudent){
+ out.println("<div id=\"sidebar-wrapper\">\n" +
+ " <ul class=\"sidebar-nav\">\n" +
+ " <li class=\"sidebar-brand\"><a href=\"overview-student.jsp?token="+token+"&projectId="+projectId+"\">overview</a></li>\n" +
+ " <li><a href=\"profile.jsp?token="+token+"&projectId="+projectId+"\">Profil</a></li>\n" +
+ " <li><a href=\"Quiz.jsp?token="+token+"&projectId="+projectId+"\">Quizfrage</a></li>\n" +
+ " <li><a href=\"eportfolio.jsp?token="+token+"&projectId="+projectId+"\">ePortfolio</a></li>\n" +
+ " <li><a href=\"researchReportOverview.jsp?token="+token+"&projectId="+projectId+"\">Beitrag</a></li>\n" +
+ " <li><a href=\"finalAssessments.jsp?token="+token+"&projectId="+projectId+"\">Bewertung</a></li>\n" +
+ " <li><a href=\"../index.jsp\">Logout</a></li>\n" +
+ " </ul>\n" +
+ " </div>");
+ } else {
+ out.println("<div id=\"sidebar-wrapper\">\n" +
+ " <ul class=\"sidebar-nav\">\n" +
+ " <li class=\"sidebar-brand\"><a href=\"overview-docent.jsp?token="+token+"&projectId="+projectId+"\">overview</a></li>\n" +
+ " <li><a href=\"Quiz-docent.jsp?token="+token+"&projectId="+projectId+"\">Quizfrage</a></li>\n" +
+ " <li><a href=\"#\">ePortfolio</a></li>\n" +
+ " <li><a href=\"#\">Beitrag</a></li>\n" +
+ " <li><a href=\"#\">Gruppen erstellen</a></li>\n" +
+ " <li><a href=\"#\">Projektphase ändern</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" +
+ " </div>");
+ }
+ }else{
+ out.println("<div class='alert alert-warning'>" +
+ "You probably did not give the token to the url" +
+ "</div>");
+ //in active System this will be the point to redirect to index.jsp, because token is "wrong"
+ }
+ if (projectId!=null)
+ out.println("<p id=\"projectId\" hidden>"+projectId+"</p>");
+ User user = management.getUserByToken(token);
+ if (user != null)
+ out.println("<p id=\"user\" hidden>"+user.getName()+"</p>");
+
+
+ }
+
+
+}
\ No newline at end of file
diff --git a/gemeinsamforschen/src/main/webapp/assets/css/researchReport.css b/gemeinsamforschen/src/main/webapp/assets/css/researchReport.css
index bd132c97584a6d2df270969e785a565d28f9c3d6..d9074aad2960cacb3b11921b1aefbdede8bad780 100644
--- a/gemeinsamforschen/src/main/webapp/assets/css/researchReport.css
+++ b/gemeinsamforschen/src/main/webapp/assets/css/researchReport.css
@@ -1,5 +1,5 @@
-/*
-html, body
+/*Uncompiled for Codepen
+body, html
width: 100%
height: 100%
margin: 0
@@ -11,90 +11,67 @@ html, body
.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
+ grid-template-rows: 5rem 100vh 7rem 5rem
+ grid-template-columns: 1fr 1fr 1fr 1fr 1fr
+ grid-template-areas: "header header header header header" "editor editor editor editor editor" ". . buttons upload ." "progress progress progress progress progress"
+ .researchReportTitlebar
+ grid-area: header
+ background-color: #003f60
+ color: white
+ display: flex
+ justify-content: center
+ align-items: center
+
+ .researchReportEditor
+ grid-area: editor
+ background: gray
+ color: black
+ display: flex
+ justify-content: Center
+ align-items: Center
+
+ .editor-inhalt
+ margin: 10rem
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 {
+ .researchReportButtons
+ background-color: #4CAF50
+ border: 1.8px solid black
+ color: gray
+ grid-area: buttons
+ padding: 15px 25px
+ text-align: Center
+ font-size: 16px
+ cursor: pointer
+
+
+ .researchReportUpload
+ grid-area: upload
+
+
+ .researchReportProgress
+ background: #003f60
+ color: red
+ grid-area: progress
+ display: flex
+ justify-content: center
+ align-items: center
+ nav
+ font-size: 1.5rem
+ menu
+ menuitem
+ a
+ color: White
+ text-decoration: none
+ margin: 0 0 0 1rem
+ cursor: pointer
+ */
+
+body, html {
width: 100%;
height: 100%;
margin: 0;
@@ -107,52 +84,48 @@ html, body {
.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;
+ grid-template-rows: 5rem 100vh 7rem 5rem;
+ grid-template-columns: 1fr 1fr 1fr 1fr 1fr;
+ grid-template-areas: "header header header header header" "editor editor editor editor editor" ". . buttons upload ." "progress progress progress progress progress";
}
-.researchReportMenu nav menu menuitem a {
- color: White;
- text-decoration: none;
- margin: 0 0 0 1rem;
-}
-
-.researchReportTitlebar {
- background: #003f60;
- color: White;
+.researchReportForm .researchReportTitlebar {
grid-area: header;
+ background-color: #003f60;
+ color: white;
display: flex;
justify-content: center;
align-items: center;
}
-
-.researchReportEditor {
+.researchReportForm .researchReportEditor {
grid-area: editor;
background: gray;
color: black;
display: flex;
- justify-content: Left;
+ justify-content: Center;
align-items: Center;
}
-.researchReportEditor .editor-inhalt {
- margin: 6rem;
+.researchReportForm .researchReportEditor .editor-inhalt {
+ margin: 10rem;
padding: 6rem;
font-size: 2rem;
color: #fff;
text-align: Left;
width: 10%;
}
-
-.researchReportProgress {
+.researchReportForm .researchReportButtons {
+ background-color: #4CAF50;
+ border: 1.8px solid black;
+ color: gray;
+ grid-area: buttons;
+ padding: 15px 25px;
+ text-align: Center;
+ font-size: 16px;
+ cursor: pointer;
+}
+.researchReportForm .researchReportUpload {
+ grid-area: upload;
+}
+.researchReportForm .researchReportProgress {
background: #003f60;
color: red;
grid-area: progress;
@@ -160,23 +133,12 @@ html, body {
justify-content: center;
align-items: center;
}
-.researchReportProgress nav {
+.researchReportForm .researchReportProgress nav {
font-size: 1.5rem;
}
-.researchReportProgress nav menu menuitem a {
+.researchReportForm .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/assets/css/researchReportOverview.css b/gemeinsamforschen/src/main/webapp/assets/css/researchReportOverview.css
new file mode 100644
index 0000000000000000000000000000000000000000..b4fbd6ef76562af9044476a5994be84fcff8e3dd
--- /dev/null
+++ b/gemeinsamforschen/src/main/webapp/assets/css/researchReportOverview.css
@@ -0,0 +1,149 @@
+/*
+Uncompiled for Codepen
+
+body, html
+ width: 100%
+ height: 100%
+ margin: 0
+ padding: 0
+ font-size: 15px
+ font-family: 'Roboto', sans-serif
+ background-color: gray
+
+.researchReportOverview
+ width: 100%
+ display: grid
+ grid-template-rows: 3rem 50vh 1rem 50vh
+ grid-template-columns: 1fr 1fr 1fr 1fr 1fr
+ grid-template-areas: "header header header header header" "report report report report report" ". . upload . ." "feed feed feed feed feed"
+
+ .researchReportTitlebar
+ grid-area: header
+ background-color: #003f60
+ color: white
+ display: flex
+ justify-content: center
+ align-items: center
+
+ table
+ table-layout: auto
+ width: 100%
+ border-collapse: collapse
+ overflow: scroll
+
+
+
+ th
+ border: 1px solid #999
+ padding: 0.5rem
+ text-align: center
+
+ td
+ border: 1px solid #999
+ padding: 0.5rem
+ text-align: left
+
+ .reports
+ grid-area: report
+ margin: auto
+ width: 50%
+ border: 3px solid #003f60
+ padding: 10px
+ background-color: white
+
+ tr:hover
+ background-color: #c0eef1
+
+ .feedbacks
+ grid-area: feed
+ margin: auto
+ width: 50%
+ border: 3px solid #003f60
+ padding: 10px
+ background-color: white
+
+
+
+ .researchReportUpload
+ grid-area: upload
+
+
+
+ */
+
+body, html {
+ width: 100%;
+ height: 100%;
+ margin: 0;
+ padding: 0;
+ font-size: 15px;
+ font-family: "Roboto", sans-serif;
+ background-color: gray;
+}
+
+.researchReportOverview {
+ width: 100%;
+ display: grid;
+ grid-template-rows: 4rem 50vh 2rem 50vh;
+ grid-template-columns: 1fr 1fr 1fr 1fr 1fr;
+ grid-template-areas: "header header header header header" "report report report report report" ". . buttons . ." "feed feed feed feed feed";
+}
+.researchReportOverview .researchReportTitlebar {
+ grid-area: header;
+ background-color: #003f60;
+ color: white;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+}
+.researchReportOverview table {
+ table-layout: auto;
+ width: 100%;
+ border-collapse: collapse;
+ overflow: scroll;
+}
+.researchReportOverview th {
+ border: 1px solid #999;
+ padding: 0.5rem;
+ text-align: center;
+}
+.researchReportOverview td {
+ border: 1px solid #999;
+ padding: 0.5rem;
+ text-align: left;
+}
+.researchReportOverview .reports {
+ grid-area: report;
+ margin: auto;
+ width: 50%;
+ border: 3px solid #003f60;
+ padding: 10px;
+ background-color: white;
+}
+.researchReportOverview tr:hover {
+ background-color: #c0eef1;
+}
+.researchReportOverview .feedbacks {
+ grid-area: feed;
+ margin: auto;
+ width: 50%;
+ border: 3px solid #003f60;
+ padding: 10px;
+ background-color: white;
+}
+.researchReportOverview .researchReportUpload {
+ grid-area: upload;
+
+
+}
+
+.researchReportOverview .researchReportButtons {
+ background-color: #4CAF50;
+ border: 1.8px solid black;
+ color: gray;
+ grid-area: buttons;
+ padding: 15px 25px;
+ text-align: Center;
+ font-size: 16px;
+ cursor: pointer;
+}
diff --git a/gemeinsamforschen/src/main/webapp/assets/jQuery-Tags-Input-master/package.json b/gemeinsamforschen/src/main/webapp/assets/jQuery-Tags-Input-master/package.json
index 8195019e54e4fea3eedb6e13ab4ff95686722e7f..09d867b21f51f370d2a4298fa4f050e6eaaf9bf4 100644
--- a/gemeinsamforschen/src/main/webapp/assets/jQuery-Tags-Input-master/package.json
+++ b/gemeinsamforschen/src/main/webapp/assets/jQuery-Tags-Input-master/package.json
@@ -20,15 +20,17 @@
},
"homepage": "https://github.com/xoxco/jQuery-Tags-Input",
"devDependencies": {
+ "filepond": "^1.8.6",
+ "filepond-plugin-image-preview": "^1.0.10",
"glob": "^4.3.1",
"grunt": "^0.4.5",
+ "grunt-cli": "^0.1.13",
"grunt-contrib-cssmin": "^0.10.0",
"grunt-contrib-uglify": "^0.6.0",
"grunt-contrib-watch": "^0.6.1",
"grunt-newer": "^0.8.0",
"jit-grunt": "^0.8.0",
"load-grunt-tasks": "^0.6.0",
- "time-grunt": "^0.4.0",
- "grunt-cli": "^0.1.13"
+ "time-grunt": "^0.4.0"
}
}
diff --git a/gemeinsamforschen/src/main/webapp/assets/js/createReportBibo.js b/gemeinsamforschen/src/main/webapp/assets/js/createReportBibo.js
new file mode 100644
index 0000000000000000000000000000000000000000..f081bae605541728a5ca619aa6b5a8b792133d20
--- /dev/null
+++ b/gemeinsamforschen/src/main/webapp/assets/js/createReportBibo.js
@@ -0,0 +1,17 @@
+var student = getQueryVariable("token");
+var project = getQueryVariable("projectId");
+
+$(document).ready(function() {
+ $('#student').val(student);
+ $('#project').val(project);
+ $('#backLink').on('click', function(){
+ location.href = "createReportOverview.jsp?token=" + student + "&projectId=" + project;
+ return false;
+ });
+
+ $('#forwardLink').on('click', function(){
+ location.href = "researchReportResearch.jsp?token=" + student + "&projectId=" + project;
+ return false;
+ });
+
+})
\ No newline at end of file
diff --git a/gemeinsamforschen/src/main/webapp/assets/js/createReportConcept.js b/gemeinsamforschen/src/main/webapp/assets/js/createReportConcept.js
new file mode 100644
index 0000000000000000000000000000000000000000..f081bae605541728a5ca619aa6b5a8b792133d20
--- /dev/null
+++ b/gemeinsamforschen/src/main/webapp/assets/js/createReportConcept.js
@@ -0,0 +1,17 @@
+var student = getQueryVariable("token");
+var project = getQueryVariable("projectId");
+
+$(document).ready(function() {
+ $('#student').val(student);
+ $('#project').val(project);
+ $('#backLink').on('click', function(){
+ location.href = "createReportOverview.jsp?token=" + student + "&projectId=" + project;
+ return false;
+ });
+
+ $('#forwardLink').on('click', function(){
+ location.href = "researchReportResearch.jsp?token=" + student + "&projectId=" + project;
+ return false;
+ });
+
+})
\ No newline at end of file
diff --git a/gemeinsamforschen/src/main/webapp/assets/js/createReportDo.js b/gemeinsamforschen/src/main/webapp/assets/js/createReportDo.js
new file mode 100644
index 0000000000000000000000000000000000000000..f081bae605541728a5ca619aa6b5a8b792133d20
--- /dev/null
+++ b/gemeinsamforschen/src/main/webapp/assets/js/createReportDo.js
@@ -0,0 +1,17 @@
+var student = getQueryVariable("token");
+var project = getQueryVariable("projectId");
+
+$(document).ready(function() {
+ $('#student').val(student);
+ $('#project').val(project);
+ $('#backLink').on('click', function(){
+ location.href = "createReportOverview.jsp?token=" + student + "&projectId=" + project;
+ return false;
+ });
+
+ $('#forwardLink').on('click', function(){
+ location.href = "researchReportResearch.jsp?token=" + student + "&projectId=" + project;
+ return false;
+ });
+
+})
\ No newline at end of file
diff --git a/gemeinsamforschen/src/main/webapp/assets/js/createReportEvaluation.js b/gemeinsamforschen/src/main/webapp/assets/js/createReportEvaluation.js
new file mode 100644
index 0000000000000000000000000000000000000000..f081bae605541728a5ca619aa6b5a8b792133d20
--- /dev/null
+++ b/gemeinsamforschen/src/main/webapp/assets/js/createReportEvaluation.js
@@ -0,0 +1,17 @@
+var student = getQueryVariable("token");
+var project = getQueryVariable("projectId");
+
+$(document).ready(function() {
+ $('#student').val(student);
+ $('#project').val(project);
+ $('#backLink').on('click', function(){
+ location.href = "createReportOverview.jsp?token=" + student + "&projectId=" + project;
+ return false;
+ });
+
+ $('#forwardLink').on('click', function(){
+ location.href = "researchReportResearch.jsp?token=" + student + "&projectId=" + project;
+ return false;
+ });
+
+})
\ No newline at end of file
diff --git a/gemeinsamforschen/src/main/webapp/assets/js/createReportMethod.js b/gemeinsamforschen/src/main/webapp/assets/js/createReportMethod.js
new file mode 100644
index 0000000000000000000000000000000000000000..f081bae605541728a5ca619aa6b5a8b792133d20
--- /dev/null
+++ b/gemeinsamforschen/src/main/webapp/assets/js/createReportMethod.js
@@ -0,0 +1,17 @@
+var student = getQueryVariable("token");
+var project = getQueryVariable("projectId");
+
+$(document).ready(function() {
+ $('#student').val(student);
+ $('#project').val(project);
+ $('#backLink').on('click', function(){
+ location.href = "createReportOverview.jsp?token=" + student + "&projectId=" + project;
+ return false;
+ });
+
+ $('#forwardLink').on('click', function(){
+ location.href = "researchReportResearch.jsp?token=" + student + "&projectId=" + project;
+ return false;
+ });
+
+})
\ No newline at end of file
diff --git a/gemeinsamforschen/src/main/webapp/assets/js/createReportOverview.js b/gemeinsamforschen/src/main/webapp/assets/js/createReportOverview.js
new file mode 100644
index 0000000000000000000000000000000000000000..1c28d5e60c9e92d28fa0955d73310f5f63fb10c3
--- /dev/null
+++ b/gemeinsamforschen/src/main/webapp/assets/js/createReportOverview.js
@@ -0,0 +1,21 @@
+var student = getQueryVariable("token");
+var project = getQueryVariable("projectId");
+
+$(document).ready(function() {
+ $('#student').val(student);
+ $('#project').val(project);
+ $('#uploader').on('click', function(){
+ //location.href="researchReportTitle.jsp?token="+getUserTokenFromUrl();
+ //boolean uploaded=true;
+ });
+ $('#backLink').on('click', function(){
+ location.href = "overview-student.jsp?token=" + student + "&projectId=" + project;
+ return false;
+ });
+
+ $('#forwardLink').on('click', function(){
+ location.href = "researchReportTitle.jsp?token=" + student + "&projectId=" + project;
+ return false;
+ });
+
+})
diff --git a/gemeinsamforschen/src/main/webapp/assets/js/createReportProgress.js b/gemeinsamforschen/src/main/webapp/assets/js/createReportProgress.js
new file mode 100644
index 0000000000000000000000000000000000000000..943d90fccab49e3b57a87cbfca5382cc6e6cf68f
--- /dev/null
+++ b/gemeinsamforschen/src/main/webapp/assets/js/createReportProgress.js
@@ -0,0 +1,41 @@
+var student = getQueryVariable("token");
+var project = getQueryVariable("projectId");
+
+$(document).ready(function() {
+ $('#student').val(student);
+ $('#project').val(project);
+
+ $('#title').on('click', function(){
+ location.href = "researchReportTitle.jsp?token=" + student + "&projectId=" + project;
+ return false;
+ });
+ $('#recherche').on('click', function(){
+ location.href = "researchReportRecherche.jsp?token=" + student + "&projectId=" + project;
+ return false;
+ });
+ $('#bibo').on('click', function(){
+ location.href = "researchReportBibo.jsp?token=" + student + "&projectId=" + project;
+ return false;
+ });
+ $('#question').on('click', function(){
+ location.href = "researchReportQuestion.jsp?token=" + student + "&projectId=" + project;
+ return false;
+ });
+ $('#concept').on('click', function(){
+ location.href = "researchReportConcept.jsp?token=" + student + "&projectId=" + project;
+ return false;
+ });
+ $('#method').on('click', function(){
+ location.href = "researchReportMethod.jsp?token=" + student + "&projectId=" + project;
+ return false;
+ });
+ $('#reportDo').on('click', function(){
+ location.href = "researchReportDo.jsp?token=" + student + "&projectId=" + project;
+ return false;
+ });
+ $('#evaluation').on('click', function(){
+ location.href = "researchReportEvaluation.jsp?token=" + student + "&projectId=" + project;
+ return false;
+ });
+
+})
diff --git a/gemeinsamforschen/src/main/webapp/assets/js/createReportQuestion.js b/gemeinsamforschen/src/main/webapp/assets/js/createReportQuestion.js
new file mode 100644
index 0000000000000000000000000000000000000000..f081bae605541728a5ca619aa6b5a8b792133d20
--- /dev/null
+++ b/gemeinsamforschen/src/main/webapp/assets/js/createReportQuestion.js
@@ -0,0 +1,17 @@
+var student = getQueryVariable("token");
+var project = getQueryVariable("projectId");
+
+$(document).ready(function() {
+ $('#student').val(student);
+ $('#project').val(project);
+ $('#backLink').on('click', function(){
+ location.href = "createReportOverview.jsp?token=" + student + "&projectId=" + project;
+ return false;
+ });
+
+ $('#forwardLink').on('click', function(){
+ location.href = "researchReportResearch.jsp?token=" + student + "&projectId=" + project;
+ return false;
+ });
+
+})
\ No newline at end of file
diff --git a/gemeinsamforschen/src/main/webapp/assets/js/createReportRecherche.js b/gemeinsamforschen/src/main/webapp/assets/js/createReportRecherche.js
new file mode 100644
index 0000000000000000000000000000000000000000..f081bae605541728a5ca619aa6b5a8b792133d20
--- /dev/null
+++ b/gemeinsamforschen/src/main/webapp/assets/js/createReportRecherche.js
@@ -0,0 +1,17 @@
+var student = getQueryVariable("token");
+var project = getQueryVariable("projectId");
+
+$(document).ready(function() {
+ $('#student').val(student);
+ $('#project').val(project);
+ $('#backLink').on('click', function(){
+ location.href = "createReportOverview.jsp?token=" + student + "&projectId=" + project;
+ return false;
+ });
+
+ $('#forwardLink').on('click', function(){
+ location.href = "researchReportResearch.jsp?token=" + student + "&projectId=" + project;
+ return false;
+ });
+
+})
\ No newline at end of file
diff --git a/gemeinsamforschen/src/main/webapp/assets/js/createReportTitle.js b/gemeinsamforschen/src/main/webapp/assets/js/createReportTitle.js
new file mode 100644
index 0000000000000000000000000000000000000000..d158a2933ed6cd848caecf9035cc2c037050a207
--- /dev/null
+++ b/gemeinsamforschen/src/main/webapp/assets/js/createReportTitle.js
@@ -0,0 +1,17 @@
+var student = getQueryVariable("token");
+var project = getQueryVariable("projectId");
+
+$(document).ready(function() {
+ $('#student').val(student);
+ $('#project').val(project);
+ $('#backLink').on('click', function(){
+ location.href = "createReportOverview.jsp?token=" + student + "&projectId=" + project;
+ return false;
+ });
+
+ $('#forwardLink').on('click', function(){
+ location.href = "researchReportResearch.jsp?token=" + student + "&projectId=" + project;
+ return false;
+ });
+
+})
diff --git a/gemeinsamforschen/src/main/webapp/assets/js/researchReportUpload.js b/gemeinsamforschen/src/main/webapp/assets/js/researchReportUpload.js
new file mode 100644
index 0000000000000000000000000000000000000000..b892da3eca8570202ea7d674579df2cfe5cf3002
--- /dev/null
+++ b/gemeinsamforschen/src/main/webapp/assets/js/researchReportUpload.js
@@ -0,0 +1,26 @@
+//import * as FilePond from 'filepond';
+//import FilePond from 'filepond';
+//import FilepondPluginImagePreview from 'filepond-plugin-image-preview';
+
+
+FilePond.registerPlugin(
+ FilePondPluginImagePreview,
+);
+
+//document.body.appendChild(pond.element);
+const inputElement = document.querySelector('input[type="file"]');
+const pond = FilePond.create(
+ inputElement,
+ {
+ allowImagePreview: true,
+ name: 'filepond',
+ labelIdle: 'Hier<span class="filepond--label-action"> Browse </span>',
+ }
+);
+
+
+FilePond.setOptions(
+ {
+ server: 'test/' //Here insert server
+ }
+);
\ No newline at end of file
diff --git a/gemeinsamforschen/src/main/webapp/pages/researchReportBibo.jsp b/gemeinsamforschen/src/main/webapp/pages/researchReportBibo.jsp
index d381386797e3f00c8ffbd18c46527e2cfafb0c8b..edda05a84cad978cd2f722ce55a37f38ca9c0d06 100644
--- a/gemeinsamforschen/src/main/webapp/pages/researchReportBibo.jsp
+++ b/gemeinsamforschen/src/main/webapp/pages/researchReportBibo.jsp
@@ -1,21 +1,14 @@
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="menu"%>
-
+<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="headLine" %>
+<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="omniDependencies" %>
<!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">
+ <omniDependencies:omniDependencies/>
+ <link href="https://unpkg.com/filepond/dist/filepond.css" rel="stylesheet"> <!--FilePond -->
+ <link href="https://unpkg.com/filepond-plugin-image-preview/dist/filepond-plugin-image-preview.css" rel="stylesheet"> <!--FilePond -->
<link rel="stylesheet" type="text/css" href="../assets/css/researchReport.css">
<title>Forschungsbericht erstellen</title>
</head>
@@ -23,19 +16,16 @@
-<form id="researchReportform" class="researchReportForm" method="POST" action="../rest/researchReport/save">
+<div id="wrapper">
+ <menu:menu></menu:menu>
+ <div class="page-content-wrapper">
+ <headLine:headLine/>
+ <div style="margin-left:50px;">
+ <table>
+ <tr>
+ <td id="yourContent">
+ <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>
@@ -50,26 +40,39 @@
<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="ResearchReportUpload">
+ <input type="file" class="filepond" name="filepond"> </input>
+ </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>
+ <menuitem><a id="title">Titel</a> </menuitem>
+ <menuitem><a id="recherche">Recherche</a> </menuitem>
+ <menuitem><a id="bibo"><font color="#green">Literaturverzeichnis</font></a> </menuitem>
+ <menuitem><a id="question">Forschnugsfrage</a> </menuitem>
+ <menuitem><a id="concept">Konzept</a></menuitem>
+ <menuitem><a id="method">Methodik</a></menuitem>
+ <menuitem><a id="reportDo">Durchführung</a></menuitem>
+ <menuitem><a id="evaluation">Evalution</a></menuitem>
</menu>
</nav>
</div>
-</form>
+ </form>
+ </td>
+ </tr>
+ </table>
+ </div>
+ </div>
+</div>
-<script>
-</script>
+<script src="../assets/js/createReportBibo.js"></script>
+<script src="../assets/js/createReportProgress.js"></script>
+<script src="https://unpkg.com/filepond/dist/filepond.js"></script> <!--FilePond -->
+<script src="https://unpkg.com/filepond-plugin-image-preview/dist/filepond-plugin-image-preview.js"></script> <!--FilePond -->
+<script>FilePond.parse(document.body);</script> <!--FilePond -->
</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
index e3329194ddd6e852c0675f67491510c48dfd0f5b..7e1516822394fcb490e0ebfc49a065b658cfd6e4 100644
--- a/gemeinsamforschen/src/main/webapp/pages/researchReportConcept.jsp
+++ b/gemeinsamforschen/src/main/webapp/pages/researchReportConcept.jsp
@@ -1,21 +1,14 @@
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="menu"%>
-
+<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="headLine" %>
+<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="omniDependencies" %>
<!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">
+ <omniDependencies:omniDependencies/>
+ <link href="https://unpkg.com/filepond/dist/filepond.css" rel="stylesheet"> <!--FilePond -->
+ <link href="https://unpkg.com/filepond-plugin-image-preview/dist/filepond-plugin-image-preview.css" rel="stylesheet"> <!--FilePond -->
<link rel="stylesheet" type="text/css" href="../assets/css/researchReport.css">
<title>Forschungsbericht erstellen</title>
</head>
@@ -25,17 +18,7 @@
<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>
@@ -50,27 +33,33 @@
<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="ResearchReportUpload">
+ <input type="file" class="filepond" name="filepond"> </input>
+ </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>
+ <menuitem><a id="title">Titel</a> </menuitem>
+ <menuitem><a id="recherche">Recherche</a> </menuitem>
+ <menuitem><a id="bibo">Literaturverzeichnis</a> </menuitem>
+ <menuitem><a id="question">Forschnugsfrage</a> </menuitem>
+ <menuitem><a id="concept"><font color="#green">Konzept</font></a></menuitem>
+ <menuitem><a id="method">Methodik</a></menuitem>
+ <menuitem><a id="reportDo">Durchführung</a></menuitem>
+ <menuitem><a id="evaluation">Evalution</a></menuitem>
</menu>
</nav>
</div>
</form>
-<script>
-</script>
+<script src="../assets/js/createReportConcept.js"></script>
+<script src="../assets/js/createReportProgress.js"></script>
+<script src="https://unpkg.com/filepond/dist/filepond.js"></script> <!--FilePond -->
+<script src="https://unpkg.com/filepond-plugin-image-preview/dist/filepond-plugin-image-preview.js"></script> <!--FilePond -->
+<script>FilePond.parse(document.body);</script> <!--FilePond -->
</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
index 2e61fc39949c13a82749b721846dbf9b316e00f6..8fe4788e758133981ca9f02ff0345f100e2de69a 100644
--- a/gemeinsamforschen/src/main/webapp/pages/researchReportDo.jsp
+++ b/gemeinsamforschen/src/main/webapp/pages/researchReportDo.jsp
@@ -1,21 +1,14 @@
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="menu"%>
-
+<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="headLine" %>
+<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="omniDependencies" %>
<!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">
+ <omniDependencies:omniDependencies/>
+ <link href="https://unpkg.com/filepond/dist/filepond.css" rel="stylesheet"> <!--FilePond -->
+ <link href="https://unpkg.com/filepond-plugin-image-preview/dist/filepond-plugin-image-preview.css" rel="stylesheet"> <!--FilePond -->
<link rel="stylesheet" type="text/css" href="../assets/css/researchReport.css">
<title>Forschungsbericht erstellen</title>
</head>
@@ -23,19 +16,15 @@
-<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 id="wrapper">
+ <menu:menu></menu:menu>
+ <div class="page-content-wrapper">
+ <headLine:headLine/>
+ <div style="margin-left:50px;">
+ <table>
+ <tr>
+ <td id="yourContent">
+ <form id="researchReportform" class="researchReportForm" method="POST" action="../rest/researchReport/save">
<div class = "researchReportTitlebar">
<h1> Forschungsbericht erstellen 7/8</h1>
@@ -50,27 +39,39 @@
<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="ResearchReportUpload">
+ <input type="file" class="filepond" name="filepond"> </input>
+ </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>
+ <menuitem><a id="title">Titel</a> </menuitem>
+ <menuitem><a id="recherche">Recherche</a> </menuitem>
+ <menuitem><a id="bibo">Literaturverzeichnis</a> </menuitem>
+ <menuitem><a id="question">Forschnugsfrage</a> </menuitem>
+ <menuitem><a id="concept">Konzept</a></menuitem>
+ <menuitem><a id="method"><font color="#green">Methodik</font></a></menuitem>
+ <menuitem><a id="reportDo">Durchführung</a></menuitem>
+ <menuitem><a id="evaluation">Evalution</a></menuitem>
</menu>
</nav>
</div>
-</form>
+ </form>
+ </td>
+ </tr>
+ </table>
+ </div>
+ </div>
+</div>
-<script>
-</script>
+<script src="../assets/js/createReportDo.js"></script>
+<script src="../assets/js/createReportProgress.js"></script>
+<script src="https://unpkg.com/filepond/dist/filepond.js"></script> <!--FilePond -->
+<script src="https://unpkg.com/filepond-plugin-image-preview/dist/filepond-plugin-image-preview.js"></script> <!--FilePond -->
+<script>FilePond.parse(document.body);</script> <!--FilePond -->
</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
index 57bea8045cf358e2b2ff765f684d102b49879246..14e034a250e36e161926ccc873a9c08727e7fc9c 100644
--- a/gemeinsamforschen/src/main/webapp/pages/researchReportEvaluation.jsp
+++ b/gemeinsamforschen/src/main/webapp/pages/researchReportEvaluation.jsp
@@ -1,21 +1,14 @@
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="menu"%>
-
+<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="headLine" %>
+<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="omniDependencies" %>
<!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">
+ <omniDependencies:omniDependencies/>
+ <link href="https://unpkg.com/filepond/dist/filepond.css" rel="stylesheet"> <!--FilePond -->
+ <link href="https://unpkg.com/filepond-plugin-image-preview/dist/filepond-plugin-image-preview.css" rel="stylesheet"> <!--FilePond -->
<link rel="stylesheet" type="text/css" href="../assets/css/researchReport.css">
<title>Forschungsbericht erstellen</title>
</head>
@@ -23,19 +16,15 @@
-<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 id="wrapper">
+ <menu:menu></menu:menu>
+ <div class="page-content-wrapper">
+ <headLine:headLine/>
+ <div style="margin-left:50px;">
+ <table>
+ <tr>
+ <td id="yourContent">
+ <form id="researchReportform" class="researchReportForm" method="POST" action="../rest/researchReport/save">
<div class = "researchReportTitlebar">
<h1> Forschungsbericht erstellen 8/8</h1>
@@ -50,27 +39,39 @@
<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="ResearchReportUpload">
+ <input type="file" class="filepond" name="filepond"> </input>
+ </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>
+ <menuitem><a id="title">Titel</a> </menuitem>
+ <menuitem><a id="recherche">Recherche</a> </menuitem>
+ <menuitem><a id="bibo">Literaturverzeichnis</a> </menuitem>
+ <menuitem><a id="question">Forschnugsfrage</a> </menuitem>
+ <menuitem><a id="concept">Konzept</a></menuitem>
+ <menuitem><a id="method">Methodik</a></menuitem>
+ <menuitem><a id="reportDo">Durchführung</a></menuitem>
+ <menuitem><a id="evaluation"><font color="#green">Evalution</font></a></menuitem>
</menu>
</nav>
</div>
-</form>
+ </form>
+ </td>
+ </tr>
+ </table>
+ </div>
+ </div>
+</div>
-<script>
-</script>
+<script src="../assets/js/createReportEvaluation.js"></script>
+<script src="../assets/js/createReportProgress.js"></script>
+<script src="https://unpkg.com/filepond/dist/filepond.js"></script> <!--FilePond -->
+<script src="https://unpkg.com/filepond-plugin-image-preview/dist/filepond-plugin-image-preview.js"></script> <!--FilePond -->
+<script>FilePond.parse(document.body);</script> <!--FilePond -->
</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
index cea25f4e97b9503d10ed2ddaa85ae698d6f43b01..1722e68b7d6ff471c3f4843d5dd3f843e47d9561 100644
--- a/gemeinsamforschen/src/main/webapp/pages/researchReportMethod.jsp
+++ b/gemeinsamforschen/src/main/webapp/pages/researchReportMethod.jsp
@@ -1,21 +1,14 @@
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="menu"%>
-
+<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="headLine" %>
+<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="omniDependencies" %>
<!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">
+ <omniDependencies:omniDependencies/>
+ <link href="https://unpkg.com/filepond/dist/filepond.css" rel="stylesheet"> <!--FilePond -->
+ <link href="https://unpkg.com/filepond-plugin-image-preview/dist/filepond-plugin-image-preview.css" rel="stylesheet"> <!--FilePond -->
<link rel="stylesheet" type="text/css" href="../assets/css/researchReport.css">
<title>Forschungsbericht erstellen</title>
</head>
@@ -23,19 +16,16 @@
-<form id="researchReportform" class="researchReportForm" method="POST" action="../rest/researchReport/save">
+<div id="wrapper">
+ <menu:menu></menu:menu>
+ <div class="page-content-wrapper">
+ <headLine:headLine/>
+ <div style="margin-left:50px;">
+ <table>
+ <tr>
+ <td id="yourContent">
+ <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>
@@ -50,27 +40,39 @@
<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="ResearchReportUpload">
+ <input type="file" class="filepond" name="filepond"> </input>
+ </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>
+ <menuitem><a id="title">Titel</a> </menuitem>
+ <menuitem><a id="recherche">Recherche</a> </menuitem>
+ <menuitem><a id="bibo">Literaturverzeichnis</a> </menuitem>
+ <menuitem><a id="question">Forschnugsfrage</a> </menuitem>
+ <menuitem><a id="concept">Konzept</a></menuitem>
+ <menuitem><a id="method"><font color="#green">Methodik</font></a></menuitem>
+ <menuitem><a id="reportDo">Durchführung</a></menuitem>
+ <menuitem><a id="evaluation">Evalution</a></menuitem>
</menu>
</nav>
</div>
-</form>
+ </form>
+ </td>
+ </tr>
+ </table>
+ </div>
+ </div>
+</div>
-<script>
-</script>
+<script src="../assets/js/createReportMethod.js"></script>
+<script src="../assets/js/createReportProgress.js"></script>
+<script src="https://unpkg.com/filepond/dist/filepond.js"></script> <!--FilePond -->
+<script src="https://unpkg.com/filepond-plugin-image-preview/dist/filepond-plugin-image-preview.js"></script> <!--FilePond -->
+<script>FilePond.parse(document.body);</script> <!--FilePond -->
</body>
</html>
\ No newline at end of file
diff --git a/gemeinsamforschen/src/main/webapp/pages/researchReportOverview.jsp b/gemeinsamforschen/src/main/webapp/pages/researchReportOverview.jsp
new file mode 100644
index 0000000000000000000000000000000000000000..014075eee00ae3a74cb07577d1df4d61ad550ea1
--- /dev/null
+++ b/gemeinsamforschen/src/main/webapp/pages/researchReportOverview.jsp
@@ -0,0 +1,125 @@
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="menu"%>
+<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="headLine" %>
+<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="omniDependencies" %>
+<html>
+<head>
+ <meta name="viewport" content="width=device-width, initial-scale=1", charset="utf-8">
+ <omniDependencies:omniDependencies/>
+ <link href="https://unpkg.com/filepond/dist/filepond.css" rel="stylesheet"> <!--FilePond -->
+ <link href="https://unpkg.com/filepond-plugin-image-preview/dist/filepond-plugin-image-preview.css" rel="stylesheet"> <!--FilePond -->
+ <link href="https://unpkg.com/filepond/dist/filepond.css" rel="stylesheet"> <!--FilePond -->
+ <link href="https://unpkg.com/filepond-plugin-image-preview/dist/filepond-plugin-image-preview.css" rel="stylesheet"> <!--FilePond -->
+ <link rel="stylesheet" type="text/css" href="../assets/css/researchReportOverview.css">
+ <script src="../assets/js/createReportOverview.js"></script>
+ <title>Forschungsbericht Ãœbersicht</title>
+
+
+</head>
+
+<body>
+
+<div id="wrapper">
+ <menu:menu></menu:menu>
+ <div class="page-content-wrapper">
+ <headLine:headLine/>
+ <div style="margin-left:50px;">
+ <table>
+ <tr>
+ <td id="yourContent">
+ <form id="researchReportOverview" class="researchReportOverview">
+ <div class = "researchReportTitlebar">
+ <h1> Forschungsbericht Ãœbersicht</h1>
+ </div>
+
+
+ <div class="reports">
+ <h2>Forschungberichte</h2>
+ <table>
+ <thead>
+ <tr>
+ <th>Titel</th>
+ <th>Autor</th>
+ <th>Placeholder</th>
+ </tr>
+ </thead>
+ <tbody>
+ <tr>
+ <td>Titel1</td>
+ <td>Autor1</td>
+ <td>1</td>
+ </tr>
+ <tr>
+ <td>Titel2</td>
+ <td>Autor2</td>
+ <td>2</td>
+ </tr>
+ <tr>
+ <td>Titel3</td>
+ <td>Autor3</td>
+ <td>3</td>
+ </tr>
+ </tbody>
+ </table>
+ </div>
+
+ <!-- <div class="ResearchReportUpload">
+ <h3>Gesamten Forschungsbericht hochladen </h3>
+ <input type="file" class="filepond" name="filepond">
+ </div> -->
+
+ <div class="feedbacks">
+ <h2>Feedbacks</h2>
+ <table>
+ <thead>
+ <tr>
+ <th>Titel</th>
+ <th>Autor</th>
+ <th>Placeholder</th>
+ </tr>
+ </thead>
+ <tbody>
+ <tr>
+ <td>Titel1</td>
+ <td>Autor1</td>
+ <td>1</td>
+ </tr>
+ <tr>
+ <td>Titel2</td>
+ <td>Autor2</td>
+ <td>2</td>
+ </tr>
+ <tr>
+ <td>Titel3</td>
+ <td>Autor3</td>
+ <td>3</td>
+ </tr>
+ </tbody>
+ </table>
+ </div>
+
+
+ <div class="ResearchReportButtons">
+ <button class="researchReportButtons"><a id="uploader">Upload File</a></button>
+ <button class="researchReportButtons"><a id="forwardLink">Bericht erstellen</a></button>
+ <button class="researchReportButtons"><a id="backLink">Zurück</a></button>
+ </div>
+
+ </form>
+ </td>
+ </tr>
+ </table>
+ </div>
+ </div>
+</div>
+
+
+
+
+<script src="https://unpkg.com/filepond/dist/filepond.js"></script> <!--FilePond -->
+<script src="https://unpkg.com/filepond-plugin-image-preview/dist/filepond-plugin-image-preview.js"></script> <!--FilePond -->
+<script>FilePond.parse(document.body);</script> <!--FilePond -->
+
+
+</body>
+</html>
diff --git a/gemeinsamforschen/src/main/webapp/pages/researchReportQuestion.jsp b/gemeinsamforschen/src/main/webapp/pages/researchReportQuestion.jsp
index ec485438f6b2494072e76f5dbdffca885719f771..8b69897fa00c07c0042cd6b0e645272351ce9576 100644
--- a/gemeinsamforschen/src/main/webapp/pages/researchReportQuestion.jsp
+++ b/gemeinsamforschen/src/main/webapp/pages/researchReportQuestion.jsp
@@ -1,21 +1,15 @@
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="menu"%>
+<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="headLine" %>
+<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="omniDependencies" %>
<!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">
+ <omniDependencies:omniDependencies/>
+ <link href="https://unpkg.com/filepond/dist/filepond.css" rel="stylesheet"> <!--FilePond -->
+ <link href="https://unpkg.com/filepond-plugin-image-preview/dist/filepond-plugin-image-preview.css" rel="stylesheet"> <!--FilePond -->
<link rel="stylesheet" type="text/css" href="../assets/css/researchReport.css">
<title>Forschungsbericht erstellen</title>
</head>
@@ -24,19 +18,16 @@
-<form id="researchReportform" class="researchReportForm" method="POST" action="../rest/researchReport/save">
+<div id="wrapper">
+ <menu:menu></menu:menu>
+ <div class="page-content-wrapper">
+ <headLine:headLine/>
+ <div style="margin-left:50px;">
+ <table>
+ <tr>
+ <td id="yourContent">
+ <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>
@@ -51,25 +42,38 @@
<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="ResearchReportUpload">
+ <input type="file" class="filepond" name="filepond"> </input>
+ </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>
+ <menuitem><a id="title">Titel</a> </menuitem>
+ <menuitem><a id="recherche">Recherche</a> </menuitem>
+ <menuitem><a id="bibo">Literaturverzeichnis</a> </menuitem>
+ <menuitem><a id="question"><font color="#green">Forschnugsfrage</font></a> </menuitem>
+ <menuitem><a id="concept">Konzept</a></menuitem>
+ <menuitem><a id="method">Methodik</a></menuitem>
+ <menuitem><a id="reportDo">Durchführung</a></menuitem>
+ <menuitem><a id="evaluation">Evalution</a></menuitem>
</menu>
</nav>
</div>
-</form>
+ </form>
+ </td>
+ </tr>
+ </table>
+ </div>
+ </div>
+</div>
+
-<script>
-</script>
+<script src="../assets/js/createReportQuestion.js"></script>
+<script src="../assets/js/createReportProgress.js"></script>
+<script src="https://unpkg.com/filepond/dist/filepond.js"></script> <!--FilePond -->
+<script src="https://unpkg.com/filepond-plugin-image-preview/dist/filepond-plugin-image-preview.js"></script> <!--FilePond -->
+<script>FilePond.parse(document.body);</script> <!--FilePond -->
</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
index e9d3d76bf7b411d6eef1e848d46bb471cc7f683e..4dcecad36722f6527192a266331b945cbe566ab9 100644
--- a/gemeinsamforschen/src/main/webapp/pages/researchReportRecherche.jsp
+++ b/gemeinsamforschen/src/main/webapp/pages/researchReportRecherche.jsp
@@ -1,41 +1,31 @@
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="menu"%>
-
+<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="headLine" %>
+<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="omniDependencies" %>
<!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">
+ <omniDependencies:omniDependencies/>
+ <link href="https://unpkg.com/filepond/dist/filepond.css" rel="stylesheet"> <!--FilePond -->
+ <link href="https://unpkg.com/filepond-plugin-image-preview/dist/filepond-plugin-image-preview.css" rel="stylesheet"> <!--FilePond -->
<link rel="stylesheet" type="text/css" href="../assets/css/researchReport.css">
<title>Forschungsbericht erstellen</title>
</head>
<body>
+<div id="wrapper">
+ <menu:menu></menu:menu>
+ <div class="page-content-wrapper">
+ <headLine:headLine/>
+ <div style="margin-left:50px;">
+ <table>
+ <tr>
+ <td id="yourContent">
+ <form id="researchReportform" class="researchReportForm" method="POST" action="../rest/researchReport/save">
-<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>
@@ -50,26 +40,42 @@
<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="ResearchReportUpload">
+ <input type="file" class="filepond" name="filepond" />
+ </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>
+ <menuitem><a id="title">Titel</a> </menuitem>
+ <menuitem><a id="recherche"><font color="#green">Recherche</font></a> </menuitem>
+ <menuitem><a id="bibo">Literaturverzeichnis</a> </menuitem>
+ <menuitem><a id="question">Forschnugsfrage</a> </menuitem>
+ <menuitem><a id="concept">Konzept</a></menuitem>
+ <menuitem><a id="method">Methodik</a></menuitem>
+ <menuitem><a id="reportDo">Durchführung</a></menuitem>
+ <menuitem><a id="evaluation">Evalution</a></menuitem>
</menu>
</nav>
</div>
-</form>
+ </form>
+ </td>
+ </tr>
+ </table>
+ </div>
+ </div>
+</div>
+
+
-<script>
-</script>
+<script src="../assets/js/createReportRecherche.js"></script>
+<script src="../assets/js/createReportProgress.js"></script>
+<script src="https://unpkg.com/filepond/dist/filepond.js"></script> <!--FilePond -->
+<script src="https://unpkg.com/filepond-plugin-image-preview/dist/filepond-plugin-image-preview.js"></script> <!--FilePond -->
+<script>FilePond.parse(document.body);</script> <!--FilePond -->
</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
index a4bdcacfcc0953dcf759f6b7c13d15544cdc1259..87a24067f088992a897f101860c5b647c167885a 100644
--- a/gemeinsamforschen/src/main/webapp/pages/researchReportTitle.jsp
+++ b/gemeinsamforschen/src/main/webapp/pages/researchReportTitle.jsp
@@ -1,31 +1,31 @@
-<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="menu"%>
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="menu" %>
+<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="headLine" %>
+<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="omniDependencies" %>
<!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">
+ <omniDependencies:omniDependencies/>
+ <link href="https://unpkg.com/filepond/dist/filepond.css" rel="stylesheet"> <!--FilePond -->
+ <link href="https://unpkg.com/filepond-plugin-image-preview/dist/filepond-plugin-image-preview.css" rel="stylesheet"> <!--FilePond -->
<link rel="stylesheet" type="text/css" href="../assets/css/researchReport.css">
<title>Forschungsbericht erstellen</title>
</head>
<body>
+<div id="wrapper">
+ <menu:menu></menu:menu>
+ <div class="page-content-wrapper">
+ <headLine:headLine/>
+ <div style="margin-left:50px;">
+ <table>
+ <tr>
+ <td id="yourContent">
+ <form id="researchReportform" class="researchReportForm" method="POST" action="../rest/researchReport/save">
-
-<form id="researchReportform" class="researchReportForm" method="POST" action="../rest/researchReport/save">
-
- <div class = "researchReportMenu">
+ <!-- <div class = "researchReportMenu">
<nav>
<menu>
<menuitem><p><a href="">Gruppe</a></p> </menuitem>
@@ -35,7 +35,7 @@
<menuitem><p><a href="">User</a></p></menuitem>
</menu>
</nav>
- </div>
+ </div> -->
<div class = "researchReportTitlebar">
<h1> Forschungsbericht erstellen 1/8</h1>
@@ -47,30 +47,45 @@
</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>
+ <button class="researchReportButtons"><a id="forwardLink">Speichern & weiter</a></button>
+ <button class="researchReportButtons"><a id="backLink"> Zurück </a></button>
</div>
+ <div class="ResearchReportUpload">
+ <input type="file" class="filepond" name="filepond"> </input>
+ </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>
+ <menuitem><a id="title"><font color="#green">Titel</font></a> </menuitem>
+ <menuitem><a id="recherche">Recherche</a> </menuitem>
+ <menuitem><a id="bibo">Literaturverzeichnis</a> </menuitem>
+ <menuitem><a id="question">Forschnugsfrage</a> </menuitem>
+ <menuitem><a id="concept">Konzept</a></menuitem>
+ <menuitem><a id="method">Methodik</a></menuitem>
+ <menuitem><a id="reportDo">Durchführung</a></menuitem>
+ <menuitem><a id="evaluation">Evalution</a></menuitem>
</menu>
</nav>
</div>
</form>
+ </td>
+ </tr>
+ </table>
+ </div>
+ </div>
+</div>
+
-<script>
+<script src="../assets/js/createReportTitle.js"></script>
+<script src="../assets/js/createReportProgress.js"></script>
+<script src="https://unpkg.com/filepond/dist/filepond.js"></script> <!--FilePond -->
+<script src="https://unpkg.com/filepond-plugin-image-preview/dist/filepond-plugin-image-preview.js"></script> <!--FilePond -->
+<script>FilePond.parse(document.body);</script> <!--FilePond -->
-</script>
</body>
</html>
\ No newline at end of file
diff --git a/gemeinsamforschen/src/scripts/dbschema/researchReport.sql b/gemeinsamforschen/src/scripts/dbschema/researchReport.sql
new file mode 100644
index 0000000000000000000000000000000000000000..29d7e18213e801159003fc9e9b8f9b593e4690a4
--- /dev/null
+++ b/gemeinsamforschen/src/scripts/dbschema/researchReport.sql
@@ -0,0 +1,16 @@
+CREATE TABLE if not exists 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,
+ `question` varchar(10000) NOT NULL,
+ `concept` varchar(10000) NOT NULL,
+ `done` varchar(10000) NOT NULL,
+ `evaluation` varchar(10000) NOT NULL,
+)ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+CREATE TABLE if not exists biblography (
+ `id` varchar(400) NOT NULL,
+ `source` varchar(400) NOT NULL,
+)ENGINE=InnoDB DEFAULT CHARSET=utf8;
\ No newline at end of file