diff --git a/gemeinsamforschen/src/main/java/unipotsdam/gf/core/management/user/HiddenUserTag.java b/gemeinsamforschen/src/main/java/unipotsdam/gf/core/management/user/HiddenUserTag.java
index 3b3800696c9a44662e03285220d62fe5e8a6822f..879ce2268e2cf4187e8f529b6636636520c39c06 100644
--- a/gemeinsamforschen/src/main/java/unipotsdam/gf/core/management/user/HiddenUserTag.java
+++ b/gemeinsamforschen/src/main/java/unipotsdam/gf/core/management/user/HiddenUserTag.java
@@ -17,6 +17,7 @@ public class HiddenUserTag extends SimpleTagSupport {
PageContext pageContext = (PageContext) getJspContext();
HttpServletRequest request = (HttpServletRequest) pageContext.getRequest();
String token = request.getParameter("token");
+
ManagementImpl management = new ManagementImpl();
User user = management.getUserByToken(token);
JspWriter out = getJspContext().getOut();
diff --git a/gemeinsamforschen/src/main/java/unipotsdam/gf/core/management/user/Menu.java b/gemeinsamforschen/src/main/java/unipotsdam/gf/core/management/user/Menu.java
index 3c280e6cb3b7410516a0818554cbbea5c540602d..7b05b106a9ec805ab525ec096bf062a5b2800b97 100644
--- a/gemeinsamforschen/src/main/java/unipotsdam/gf/core/management/user/Menu.java
+++ b/gemeinsamforschen/src/main/java/unipotsdam/gf/core/management/user/Menu.java
@@ -1,6 +1,5 @@
package unipotsdam.gf.core.management.user;
-import unipotsdam.gf.core.management.Management;
import unipotsdam.gf.core.management.ManagementImpl;
import javax.servlet.http.HttpServletRequest;
@@ -12,38 +11,48 @@ import java.io.IOException;
public class Menu extends SimpleTagSupport {
public void doTag() throws JspException, IOException {
- Management management = new ManagementImpl();
PageContext pageContext = (PageContext) getJspContext();
HttpServletRequest request = (HttpServletRequest) pageContext.getRequest();
String token = request.getParameter("token");
- User user = management.getUserByToken(token);
+ ManagementImpl management = new ManagementImpl();
JspWriter out = getJspContext().getOut();
- 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.html\">overview</a></li>\n" +
- " <li><a href=\"takeQuiz.jsp\">Quizfrage</a></li>\n" +
- " <li><a href=\"eportfolio.jsp\">ePortfolio</a></li>\n" +
- " <li><a href=\"#\">Beitrag</a></li>\n" +
- " <li><a href=\"finalAssessments.jsp\">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.html\">overview</a></li>\n" +
- " <li><a href=\"createQuiz.jsp\">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\">Bewertung</a></li>\n" +
- " <li><a href=\"../index.jsp\">Logout</a></li>\n" +
- " </ul>\n" +
- " </div>");
+ 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+"\">overview</a></li>\n" +
+ " <li><a href=\"Quiz.jsp?token="+token+"\">Quizfrage</a></li>\n" +
+ " <li><a href=\"eportfolio.jsp?token="+token+"\">ePortfolio</a></li>\n" +
+ " <li><a href=\"#\">Beitrag</a></li>\n" +
+ " <li><a href=\"finalAssessments.jsp?token="+token+"\">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+"\">overview</a></li>\n" +
+ " <li><a href=\"Quiz.jsp?token="+token+"\">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"
}
+
}
+
+
};
\ No newline at end of file
diff --git a/gemeinsamforschen/src/main/java/unipotsdam/gf/core/management/user/UserService.java b/gemeinsamforschen/src/main/java/unipotsdam/gf/core/management/user/UserService.java
index dd60731bfec82b9d1f9ce9138890407b116d5db4..c457c47cbc5f6e5a115d7d44fc9fe4cb59858e12 100644
--- a/gemeinsamforschen/src/main/java/unipotsdam/gf/core/management/user/UserService.java
+++ b/gemeinsamforschen/src/main/java/unipotsdam/gf/core/management/user/UserService.java
@@ -138,9 +138,9 @@ public class UserService {
private Response redirectToProjectPage(User user, ManagementImpl management) throws URISyntaxException {
String successUrl;
if (user.getStudent() != null && user.getStudent()) {
- successUrl = "../pages/overview-student.html?token=";
+ successUrl = "../pages/overview-student.jsp?token=";
} else {
- successUrl = "../pages/overview-docent.html?token=";
+ successUrl = "../pages/overview-docent.jsp?token=";
}
successUrl += management.getUserToken(user);
return forwardToLocation(successUrl);
diff --git a/gemeinsamforschen/src/main/java/unipotsdam/gf/interfaces/IPeerAssessment.java b/gemeinsamforschen/src/main/java/unipotsdam/gf/interfaces/IPeerAssessment.java
index 9a23d8f4d3036c6bd9f728e7d6cc213beaa42fa1..e3b65f1474d62074a4cf33b422a11ebda2d478b0 100644
--- a/gemeinsamforschen/src/main/java/unipotsdam/gf/interfaces/IPeerAssessment.java
+++ b/gemeinsamforschen/src/main/java/unipotsdam/gf/interfaces/IPeerAssessment.java
@@ -69,9 +69,9 @@ public interface IPeerAssessment {
/**
* writes the peerRatings into db
*
+ * @param peerRatings
* @param projectId
* @param groupId
- * @param peerRatings
*/
- void postPeerRating(String projectId, String groupId, ArrayList<PeerRating> peerRatings);
+ void postPeerRating(ArrayList<PeerRating> peerRatings, String projectId, String groupId);
}
diff --git a/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/assessment/controller/service/FBAssessement.java b/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/assessment/controller/service/FBAssessement.java
index 3368ce839633cd4e5172cffdad36fca4031604cb..df592667c5c569eaaa9f60dd7f6d75f30bc34789 100644
--- a/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/assessment/controller/service/FBAssessement.java
+++ b/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/assessment/controller/service/FBAssessement.java
@@ -54,7 +54,7 @@ public class FBAssessement extends AssessmentDAO {
}
@Override
- public void postPeerRating(String projectId, String groupId, ArrayList<PeerRating> peerRatings) {
+ public void postPeerRating(ArrayList<PeerRating> peerRatings, String projectId, String groupId) {
}
}
diff --git a/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/assessment/controller/service/PeerAssessment.java b/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/assessment/controller/service/PeerAssessment.java
index 418f4fed993a364cb82b9ea4793dc066d9a9b75f..6c427c4bbe90c8d3b52417609a19b786112623be 100644
--- a/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/assessment/controller/service/PeerAssessment.java
+++ b/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/assessment/controller/service/PeerAssessment.java
@@ -48,7 +48,7 @@ public class PeerAssessment implements IPeerAssessment {
}
@Override
- public void postPeerRating(String projectId, String groupId, ArrayList<PeerRating> peerRatings) {
+ public void postPeerRating(ArrayList<PeerRating> peerRatings, String projectId, String groupId) {
}
}
diff --git a/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/assessment/controller/service/PeerAssessmentDummy.java b/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/assessment/controller/service/PeerAssessmentDummy.java
index 6d7e933916299299ee0c696da4ec8b372bf18848..9de14e218b2f2eb3eb99edd1da2fd22199bdd178 100644
--- a/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/assessment/controller/service/PeerAssessmentDummy.java
+++ b/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/assessment/controller/service/PeerAssessmentDummy.java
@@ -49,8 +49,8 @@ public class PeerAssessmentDummy implements IPeerAssessment {
}
@Override
- public void postPeerRating(String projectId, String groupId, ArrayList<PeerRating> peerRatings) {
- int breakpoint = 0;
+ public void postPeerRating(ArrayList<PeerRating> peerRatings, String projectId, String groupId) {
+ int breakpoint = 0; //todo: print an http-answer for the ajax-request to receive
}
@Override
@@ -68,17 +68,17 @@ public class PeerAssessmentDummy implements IPeerAssessment {
@Override
public List<Grading> calculateAssessment(ArrayList<Performance> totalPerformance) {
- double[] allAssessements = new double[totalPerformance.size()];
+ double[] allAssessments = new double[totalPerformance.size()];
Grading[] grading = new Grading[totalPerformance.size()];
for (int i = 0; i < totalPerformance.size(); i++) {
for (int j = 0; j < totalPerformance.get(i).getQuizAnswer().length; j++) {
- allAssessements[i] += totalPerformance.get(i).getQuizAnswer()[j];
+ allAssessments[i] += totalPerformance.get(i).getQuizAnswer()[j];
}
- allAssessements[i] = allAssessements[i] / totalPerformance.get(i).getQuizAnswer().length;
+ allAssessments[i] = allAssessments[i] / totalPerformance.get(i).getQuizAnswer().length;
}
for (int i = 0; i < totalPerformance.size(); i++) {
- Grading shuttle = new Grading(totalPerformance.get(i).getStudentIdentifier(), allAssessements[i]);
+ Grading shuttle = new Grading(totalPerformance.get(i).getStudentIdentifier(), allAssessments[i]);
grading[i] = shuttle;
}
return Arrays.asList(grading);
diff --git a/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/assessment/controller/view/QuizView.java b/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/assessment/controller/view/QuizView.java
index 077ebb237b82d80b98d3ac19911fba729d5494ea..4c80528c972530f75867f2f8c8260dc0ffc68893 100644
--- a/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/assessment/controller/view/QuizView.java
+++ b/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/assessment/controller/view/QuizView.java
@@ -32,8 +32,9 @@ public class QuizView implements IPeerAssessment {
@Consumes(MediaType.APPLICATION_JSON)
@Path("/peer/project/{projectId}/group/{groupId}")
@Override
- public void postPeerRating(@PathParam("projectId") String projectId, @PathParam("groupId") String groupId, ArrayList<PeerRating> peerRatings){
- peer.postPeerRating(projectId,groupId,peerRatings);
+ public void postPeerRating(ArrayList<PeerRating> peerRatings,@PathParam("projectId") String projectId, @PathParam("groupId") String groupId){
+ peer.postPeerRating(peerRatings, projectId,groupId);
+ //todo: checkout the POST-variable. should be peerRating but its null atm.
}
@POST
diff --git a/gemeinsamforschen/src/main/webapp/assets/css/footer.css b/gemeinsamforschen/src/main/webapp/assets/css/footer.css
new file mode 100644
index 0000000000000000000000000000000000000000..2e2c0e2201dbb15067036094d7b3347845b22d96
--- /dev/null
+++ b/gemeinsamforschen/src/main/webapp/assets/css/footer.css
@@ -0,0 +1,43 @@
+.pg-rest{
+ background:#DDDDDD;
+}
+
+.pg-enrollment {
+ background: #777777;
+ width:5%;
+}
+
+.pg-groups {
+ background: #AAAA77;
+ width:15%;
+}
+
+.pg-dossier {
+ background: #AA77AA;
+ width:30%;
+}
+
+.pg-feedback {
+ background: #77AAAA;
+ width:45%;
+}
+
+.pg-reflection {
+ background: #55AA55;
+ width:60%;
+}
+
+.pg-presentation {
+ background: #5555AA;
+ width:70%;
+}
+
+.pg-assessment {
+ background: #AA5555;
+ width:85%;
+}
+
+.pg-done {
+ background: #34DD44;
+ width:100%;
+}
diff --git a/gemeinsamforschen/src/main/webapp/assets/css/styles.css b/gemeinsamforschen/src/main/webapp/assets/css/styles.css
index b4a3cba5eaa0697dd95ceb3a0436550950ed4f1c..fffdfbf285b9cafc55d919ae1328ecfe7aa31cfb 100644
--- a/gemeinsamforschen/src/main/webapp/assets/css/styles.css
+++ b/gemeinsamforschen/src/main/webapp/assets/css/styles.css
@@ -5,6 +5,10 @@
opacity: 0;
}
+tr .pageChanger{
+ cursor:pointer;
+}
+
.loader {
display: block;
margin-left: 470px;
diff --git a/gemeinsamforschen/src/main/webapp/assets/css/upload-unstructured.css b/gemeinsamforschen/src/main/webapp/assets/css/upload-unstructured.css
new file mode 100644
index 0000000000000000000000000000000000000000..16ff7e4ce9ecbb4d462b22445ac2bbe064279705
--- /dev/null
+++ b/gemeinsamforschen/src/main/webapp/assets/css/upload-unstructured.css
@@ -0,0 +1,143 @@
+ol {
+ padding: 0px;
+ margin: 0px;
+ list-style-type: none;
+}
+.mainpage {
+ display: flex;
+ box-sizing: border-box;
+ font-family: Arial;
+ height: 100%;
+}
+.rightcolumn {
+ float: right;
+ width: 25%;
+ display: inline-block;
+ /* background-color: blue; */
+}
+.leftcolumn {
+ float: left;
+ width: 75%;
+ display: inline-block;
+ /* background-color: yellow; */
+}
+.rightcontent {
+ margin: 10px;
+}
+.leftcontent {
+ margin: 10px;
+ /* background-color: white; */
+}
+.spacing {
+ height: 10px;
+ /* background-color: orange; */
+}
+
+.annotation-card {
+ width: 100%;
+ box-shadow: 0 4px 8px 0 rgba(0,0,0,0.2);
+ transition: 0.3s;
+ border-radius: 5px;
+ display: inline-block;
+ background-color: white;
+}
+.annotation-card:hover {
+ box-shadow: 0 8px 16px 0 rgba(0,0,0,0.2);
+}
+.annotation-header {
+ padding: 5px;
+ display: flex;
+ flex-wrap: wrap;
+ align-items: center;
+ border-top-right-radius: 5px;
+ border-top-left-radius: 5px;
+ color: white; }
+.annotation-header i {
+ font-size: 11px;
+}
+.annotation-header span {
+ font-size: 11px;
+ margin-left: 5px;
+ margin-right: 5px;
+}
+.annotation-header a:link {
+ color: white;
+ text-decoration: none;
+}
+.annotation-header a:visited {
+ color: white;
+ text-decoration: none;
+}
+.annotation-header a:active {
+ color: white;
+ text-decoration: none;
+}
+.annotation-header a:hover {
+ color: #e6e6e6;
+ text-decoration: none;
+}
+.annotation-header-title {
+ display: flex;
+ flex-flow: column;
+ width: calc(100% - 40px);
+}
+.annotation-header-toggle {
+ height: 40px;
+ width: 40px;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ cursor: pointer;
+}
+.annotation-body {
+ padding: 8px;
+ border-bottom-right-radius: 5px;
+ border-bottom-left-radius: 5px;
+}
+.annotation-body p {
+ margin: 0px;
+ font-size: 13px;
+}
+.overflow-hidden {
+ overflow: hidden;
+ white-space: nowrap;
+ text-overflow: ellipsis;
+}
+.annotation-footer {
+ padding: 5px;
+ padding-top: 0px;
+ text-align: right;
+ font-size: 9px;
+ color: lightgrey;
+ display: flex;
+}
+.annotation-footer span {
+ margin-left: 5px;
+}
+.annotation-footer-delete {
+ margin-right: 5px;
+ cursor: pointer;
+}
+.annotation-footer-date {
+ flex: 1
+}
+
+
+
+.unstructured-textarea {
+ resize: none;
+}
+.document-text-buttons {
+ margin-top: 10px;
+ display: inline;
+}
+.document-text-buttons-lock {
+ float: left;
+}
+.document-text-buttons-back {
+ float: left;
+}
+.document-text-buttons-save {
+ float: right;
+}
+
diff --git a/gemeinsamforschen/src/main/webapp/assets/js/Quiz.js b/gemeinsamforschen/src/main/webapp/assets/js/Quiz.js
new file mode 100644
index 0000000000000000000000000000000000000000..afd43343d62eb5b43aa235ceb3c94683ede88baf
--- /dev/null
+++ b/gemeinsamforschen/src/main/webapp/assets/js/Quiz.js
@@ -0,0 +1,26 @@
+$(document).ready(function(){
+ $.ajax({
+ url: '../rest/assessments/project/1/quiz/',
+ type: 'GET',
+ success: function (data) {
+ var table = document.getElementById('myQuizzes');
+ for (var quiz = 0; quiz < data.length; quiz++){
+ var answers = data[quiz].correctAnswers.concat(data[quiz].incorrectAnswers);
+ var colspan = answers.length;
+ var trQuestion = document.createElement('TR');
+ trQuestion.className="pageChanger";
+ trQuestion.innerHTML = '<td colspan="' + colspan + '"><h3>' +
+ '<a href="viewQuiz.jsp?token='+getUserTokenFromUrl()+'&quizId='+ encodeURI(data[quiz].question) + '"</a>' +
+ data[quiz].question+'</h3></td>';
+ table.appendChild(trQuestion);
+ }
+ },
+ error: function (a, b, c) {
+ alert('Fehler ' + a);
+ }
+ });
+
+ $('#newQuiz').on('click', function(){
+ location.href="createQuiz.jsp?token="+getUserTokenFromUrl();
+ });
+});
diff --git a/gemeinsamforschen/src/main/webapp/assets/js/createQuiz.js b/gemeinsamforschen/src/main/webapp/assets/js/createQuiz.js
new file mode 100644
index 0000000000000000000000000000000000000000..764a7a90dfd06ce45531d359c31d592b3a39c0f7
--- /dev/null
+++ b/gemeinsamforschen/src/main/webapp/assets/js/createQuiz.js
@@ -0,0 +1,5 @@
+$(document).ready(function () {
+ $("#save").on('click', function () {
+ document.location = "Quiz.jsp?token=" + getUserTokenFromUrl();
+ });
+});
diff --git a/gemeinsamforschen/src/main/webapp/assets/js/enrollProject.js b/gemeinsamforschen/src/main/webapp/assets/js/enrollProject.js
new file mode 100644
index 0000000000000000000000000000000000000000..5969e8ae46238871a6b97f80c039b3df93fee435
--- /dev/null
+++ b/gemeinsamforschen/src/main/webapp/assets/js/enrollProject.js
@@ -0,0 +1,5 @@
+$(document).ready(function () {
+ $('#submit').on('click',function(){
+ document.location="specificSkills.jsp?token="+getUserTokenFromUrl();
+ });
+});
\ No newline at end of file
diff --git a/gemeinsamforschen/src/main/webapp/assets/js/finalAssessment.js b/gemeinsamforschen/src/main/webapp/assets/js/finalAssessment.js
index a42d6489e0ef6234a63275d85c978a6d2155c399..7cefb9d460fc4665b58ae33f96bed4267a86b0bb 100644
--- a/gemeinsamforschen/src/main/webapp/assets/js/finalAssessment.js
+++ b/gemeinsamforschen/src/main/webapp/assets/js/finalAssessment.js
@@ -6,6 +6,11 @@ $(document).ready(function() {
assessPeer();
});
});
+
+function getUser(){//todo: you can see what you need to do
+ return "dummy";
+}
+
function assessPeer(){
var peerRating = {
"fromPeer": getUser(),
@@ -28,7 +33,7 @@ function assessPeer(){
},
data: JSON.stringify(dataP),
success: function(){
-
+ location.href="takeQuiz.jsp?token="+getUserTokenFromUrl();
},
error: function(a,b,c){
diff --git a/gemeinsamforschen/src/main/webapp/assets/js/footer.js b/gemeinsamforschen/src/main/webapp/assets/js/footer.js
new file mode 100644
index 0000000000000000000000000000000000000000..33e3ada606d22727234e01d6fa131f67e1240009
--- /dev/null
+++ b/gemeinsamforschen/src/main/webapp/assets/js/footer.js
@@ -0,0 +1,31 @@
+$(document).ready(function(){
+ $('#nextPhase').click(function(){
+ var progressbar =$('#progressbar');
+ switch (progressbar.attr('class')){
+ case 'progress-bar pg-groups':
+ progressbar.removeClass('pg-groups');
+ progressbar.addClass('pg-dossier');
+ break;
+ case 'progress-bar pg-dossier':
+ progressbar.removeClass('pg-dossier');
+ progressbar.addClass('pg-feedback');
+ break;
+ case 'progress-bar pg-feedback':
+ progressbar.removeClass('pg-feedback');
+ progressbar.addClass('pg-reflection');
+ break;
+ case 'progress-bar pg-reflection':
+ progressbar.removeClass('pg-reflection');
+ progressbar.addClass('pg-presentation');
+ break;
+ case 'progress-bar pg-presentation':
+ progressbar.removeClass('pg-presentation');
+ progressbar.addClass('pg-assessment');
+ break;
+ case 'progress-bar pg-assessment':
+ progressbar.removeClass('pg-assessment');
+ progressbar.addClass('pg-done');
+ break;
+ }
+ });
+});
diff --git a/gemeinsamforschen/src/main/webapp/assets/js/overview-student.js b/gemeinsamforschen/src/main/webapp/assets/js/overview-student.js
index 58a1b769651bb338348cdd908d25faa7b9c4037e..2cf207efe43ac69de868491e3264e78c837b0e9c 100644
--- a/gemeinsamforschen/src/main/webapp/assets/js/overview-student.js
+++ b/gemeinsamforschen/src/main/webapp/assets/js/overview-student.js
@@ -2,4 +2,7 @@ $(document).ready(function(){
$('#project1Link').on('click', function(){
location.href="project-student.jsp?token="+getUserTokenFromUrl();
});
+ $('#enrollProject').on('click', function(){
+ location.href="enrollProject.jsp?token="+getUserTokenFromUrl();
+ });
});
\ No newline at end of file
diff --git a/gemeinsamforschen/src/main/webapp/assets/js/project-student.js b/gemeinsamforschen/src/main/webapp/assets/js/project-student.js
index 2a714319632270bda633f5c91cc11b6959a18083..ffc7facbdd443de53ce28d7faeb0cefd84298e7a 100644
--- a/gemeinsamforschen/src/main/webapp/assets/js/project-student.js
+++ b/gemeinsamforschen/src/main/webapp/assets/js/project-student.js
@@ -1,23 +1,23 @@
$(document).ready(function(){
-
- $('.projectId').click(function () {
- location.href="project-student.jsp?token="+getUserTokenFromUrl();
+ /*
+ var memberTable = $('#myGroupMembers');
+ memberTable.hide();
+ $('#nextPhase').on('click',function(){
+ memberTable.show();
});
-
+ */
$('.givefeedback').click(function () {
location.href="givefeedback.jsp?token="+getUserTokenFromUrl();
- })
-
+ });
$('.viewfeedback').click(function () {
location.href="viewfeedback.jsp?token="+getUserTokenFromUrl();
- })
+ });
$('.annotationview').click(function () {
location.href="annotation-document.jsp?token="+getUserTokenFromUrl();
- })
+ });
- $('. overviewstudent').click(function () {
- location.href="project-student.jsp?token="+getUserTokenFromUrl();
+ $('#btnUnstructuredUpload').click(function () {
+ location.href="upload-unstructured.jsp?token="+getUserTokenFromUrl();
})
-
});
\ No newline at end of file
diff --git a/gemeinsamforschen/src/main/webapp/assets/js/rateContribution.js b/gemeinsamforschen/src/main/webapp/assets/js/rateContribution.js
new file mode 100644
index 0000000000000000000000000000000000000000..8d6c7c7b53d0fd8323dd23e2abea8d79c298954c
--- /dev/null
+++ b/gemeinsamforschen/src/main/webapp/assets/js/rateContribution.js
@@ -0,0 +1,28 @@
+$(document).ready(function () {
+ var ejournalFeedback = new InscrybMDE({
+ element: document.getElementById("ejournalFeedback"),
+ spellChecker: false,
+ //toolbar: ["bold", "italic", "heading", "|", "quote", "table", "code", "|" , "side-by-side", "fullscreen"],
+ minHeight: "80px",
+ });
+ var presentationFeedback = new InscrybMDE({
+ element: document.getElementById("presentationFeedback"),
+ spellChecker: false,
+ //toolbar: ["bold", "italic", "heading", "|", "quote", "table", "code", "|" , "side-by-side", "fullscreen"],
+ minHeight: "80px",
+ });
+ var dossierFeedback = new InscrybMDE({
+ element: document.getElementById("dossierFeedback"),
+ spellChecker: false,
+ //toolbar: ["bold", "italic", "heading", "|", "quote", "table", "code", "|" , "side-by-side", "fullscreen"],
+ minHeight: "80px",
+ });
+
+
+ editor.style = "min-height: 100px";
+
+
+ $('#submit').on('click',function(){
+ document.location="project-student.jsp?token="+getUserTokenFromUrl();
+ });
+});
\ No newline at end of file
diff --git a/gemeinsamforschen/src/main/webapp/assets/js/specificSkills.js b/gemeinsamforschen/src/main/webapp/assets/js/specificSkills.js
new file mode 100644
index 0000000000000000000000000000000000000000..8d1851f25824e78c10507f81b2e988fddafabbd2
--- /dev/null
+++ b/gemeinsamforschen/src/main/webapp/assets/js/specificSkills.js
@@ -0,0 +1,5 @@
+$(document).ready(function () {
+ $('#submit').on('click',function(){
+ document.location="project-student.jsp?token="+getUserTokenFromUrl();
+ });
+});
\ No newline at end of file
diff --git a/gemeinsamforschen/src/main/webapp/assets/js/takeQuiz.js b/gemeinsamforschen/src/main/webapp/assets/js/takeQuiz.js
index 68179aa9e1fa56b698992bc3212e2bd41b2d4a94..9bc226153048dc0874087970dddf8a9965b3295e 100644
--- a/gemeinsamforschen/src/main/webapp/assets/js/takeQuiz.js
+++ b/gemeinsamforschen/src/main/webapp/assets/js/takeQuiz.js
@@ -34,18 +34,29 @@ $(document).ready(function () {
success: function (data) {
var table = document.getElementById('tableQuiz');
for (var quiz = 0; quiz < data.length; quiz++){
+ var question = data[quiz].question.replace(/ /g,"").replace("?","").replace(",","");
var answers = data[quiz].correctAnswers.concat(data[quiz].incorrectAnswers);
var colspan = answers.length;
var trQuestion = document.createElement('TR');
- var question = '<td colspan="' + colspan + '">' + data[quiz].question + '</td>';
- trQuestion.innerHTML = question;
+ var tdQuestion = '<td colspan="' + colspan + '"' +
+ 'data-toggle="collapse" href="#'+question+'" aria-expanded="false" aria-controls="'+question+'">' +
+ '' + data[quiz].question + '</td>';
+ trQuestion.innerHTML = tdQuestion;
var trAnswers = document.createElement('TR');
answers = shuffle(answers);
- var answersTd='<div class="quiz" id="quiz" data-toggle="buttons"><td style="display: block;">';
+ var answersTd='<td style="display: block;"><div class="quiz collapse" id="'+question+'" data-toggle="buttons">';
for (var i = 0; i < answers.length; i++) {
- answersTd = answersTd + '<div><label class="element-animation1 btn btn-lg btn-primary btn-block"><span class="btn-label"><i class="glyphicon glyphicon-chevron-right"></i></span><input type="checkbox">' + answers[i] + '</label></div>';
+ answersTd = answersTd + '<div>' +
+ '<label class="element-animation1 btn btn-lg btn-primary btn-block">' +
+ '<span class="btn-label">' +
+ '<i class="glyphicon glyphicon-chevron-right">' +
+ '</i>' +
+ '</span>' +
+ '<input type="checkbox">' + answers[i] + '' +
+ '</label>' +
+ '</div>';
}
- question ="";
+ tdQuestion ="";
answers=[];
trAnswers.innerHTML = answersTd+'</div></td>';
table.appendChild(trQuestion);
@@ -57,7 +68,7 @@ $(document).ready(function () {
}
});
$("#submitQuiz").on("click", function () {
-
+ document.location="rateContribution.jsp?token="+getUserTokenFromUrl();
});
});
diff --git a/gemeinsamforschen/src/main/webapp/assets/js/uploadUnstructured.js b/gemeinsamforschen/src/main/webapp/assets/js/uploadUnstructured.js
new file mode 100644
index 0000000000000000000000000000000000000000..dd85243d662c9bf71e25212e89c42597e830c3d9
--- /dev/null
+++ b/gemeinsamforschen/src/main/webapp/assets/js/uploadUnstructured.js
@@ -0,0 +1,490 @@
+// initialize userId, userColors and targetId
+var userId = randomUserId();
+var userColors = new Map();
+var userColorsDark = new Map();
+var targetId = 200;
+
+// declare document text
+var documentText;
+
+/**
+ * This function will fire when the DOM is ready
+ */
+$(document).ready(function() {
+
+ /**
+ * Context menu handler
+ */
+ $.contextMenu({
+ selector: '.context-menu-one',
+ callback: function(key, options) {
+
+ // close context menu
+ window.close;
+
+ // initialize selected body
+ var body = getSelectedTextFromTextArea();
+
+ // if user selected something
+ if (body.length > 0) {
+ // annotationPostRequest
+ var request = {
+ userId: userId,
+ targetId: targetId,
+ body: body,
+ startCharacter: window.getSelection().getRangeAt(0).startOffset,
+ endCharacter: window.getSelection().getRangeAt(0).endOffset
+ };
+
+ console.log(request);
+
+ createAnnotation(request, function(response) {
+ // display the new annotation
+ displayAnnotation(response);
+
+ });
+ }
+
+ },
+ items: {
+ "annotation": {name: "Annotation", icon: "edit"}
+ }
+ });
+
+ $('#btnSave').click(function () {
+ location.href="project-student.jsp?token="+getUserTokenFromUrl();
+ });
+
+ $('#btnBack').click(function () {
+ location.href="project-student.jsp?token="+getUserTokenFromUrl();
+ });
+
+ documentText = $('#documentText').html();
+
+ // fetch annotations from server on page start
+ getAnnotations(targetId, function (response) {
+ // iterate over annotations and display each
+ $.each(response, function (i, annotation) {
+ displayAnnotation(annotation);
+ })
+ });
+
+});
+
+/**
+ * POST: Save an annotation in the database
+ *
+ * @param annotationPostRequest The post request
+ * @param responseHandler The response handler
+ */
+function createAnnotation(annotationPostRequest, responseHandler) {
+ var url = "http://localhost:8080/rest/annotations/";
+ var json = JSON.stringify(annotationPostRequest);
+ $.ajax({
+ url: url,
+ type: "POST",
+ data: json,
+ contentType: "application/json",
+ dataType: "json",
+ success: function (response) {
+ responseHandler(response);
+ }
+ });
+}
+
+/**
+ * PATCH: Alter an annotation in database
+ *
+ * @param id The annotation id
+ * @param annotationPatchRequest The patch request
+ * @param responseHandler The response handler
+ */
+function alterAnnotation(id, annotationPatchRequest, responseHandler) {
+ var url = "http://localhost:8080/rest/annotations/" + id;
+ var json = JSON.stringify(annotationPatchRequest);
+ $.ajax({
+ url: url,
+ type: "PATCH",
+ data: json,
+ contentType: "application/json",
+ dataType: "json",
+ success: function (response) {
+ responseHandler(response);
+ }
+ });
+}
+
+/**
+ * DELETE: Delete an annotation from database
+ *
+ * @param id The annotation id
+ */
+function deleteAnnotation(id) {
+ var url = "http://localhost:8080/rest/annotations/" + id;
+ $.ajax({
+ url: url,
+ type: "DELETE",
+ dataType: "json",
+ success: function (response) {
+ // Nothing to do
+ }
+ });
+}
+
+/**
+ * GET: Get all annotations from database for a specific target
+ *
+ *
+ * @param targetId The target id
+ * @param responseHandler The response handler
+ */
+function getAnnotations(targetId, responseHandler) {
+ var url = "http://localhost:8080/rest/annotations/target/" + targetId;
+ $.ajax({
+ url: url,
+ type: "GET",
+ dataType: "json",
+ success: function (response) {
+ // sort the responding annotations by timestamp (DESC)
+ response.sort(function (a, b) {
+ return a.timestamp - b.timestamp;
+ });
+ // handle the response
+ responseHandler(response);
+ }
+ });
+}
+
+/**
+ * Delete annotation from list
+ *
+ * @param elem The parent li element
+ * @param id The id of the annotation
+ */
+function deleteUnstructuredAnnotationHandler(elem, id) {
+ // remove annotation from list
+ elem.remove()
+ // remove annotation from database
+ deleteAnnotation(id)
+}
+
+/**
+ * Display annotation in the list
+ *
+ * @param annotation The annotation to be displayed
+ */
+function displayAnnotation(annotation) {
+ // fetch list of annotations
+ var list = $('#annotations')
+
+ var deleteIcon = "fas fa-trash";
+ var dateIcon = "fas fa-calendar";
+ if (isTimestampToday(annotation.timestamp)) {
+ dateIcon = "fas fa-clock";
+ }
+
+ // insert annotation card
+ list.prepend(
+ $('<li>')
+ .attr('class', 'listelement')
+ .append(
+ $('<div>').attr('class', 'annotation-card')
+ .mouseenter(function () {
+ $(this).children('.annotation-header').css('background-color', getDarkUserColor(annotation.userId));
+ })
+ .mouseleave(function () {
+ $(this).children('.annotation-header').css('background-color', getUserColor(annotation.userId));
+ })
+ .append(
+ $('<div>').attr('class', 'annotation-header')
+ .css('background-color', getUserColor(annotation.userId))
+ .append(
+ $('<div>').attr('class', 'annotation-header-title')
+ .append(
+ $('<div>').attr('class', 'overflow-hidden')
+ .append(
+ $('<i>').attr('class', 'fas fa-user')
+ )
+ .append(
+ $('<span>').append(annotation.userId)
+ )
+ )
+ .append(
+ $('<div>').attr('class', 'overflow-hidden')
+ .append(
+ $('<i>').attr('class', 'fas fa-bookmark')
+ )
+ .append(
+ $('<span>').append('title' + annotation.userId)
+ )
+ )
+ )
+ .append(
+ $('<div>').attr('class', 'annotation-header-toggle')
+ .click(function () {
+ toggleButtonHandler($(this));
+ })
+ .append(
+ $('<i>').attr('class', 'fas fa-chevron-down')
+ )
+ )
+ )
+ .append(
+ $('<div>').attr('class', 'annotation-body')
+ .append(
+ $('<p>').attr('class', 'overflow-hidden').append(annotation.body)
+ )
+ )
+ .append(
+ $('<div>').attr('class', 'annotation-footer')
+ .append(
+ function () {
+ if (userId == annotation.userId) {
+ return $('<div>').attr('class', 'annotation-footer-delete')
+ .append(
+ $('<i>').attr('class', deleteIcon)
+ )
+ .click(function () {
+ deleteUnstructuredAnnotationHandler($(this).closest('li'), annotation.id)
+ })
+ }
+ }
+ )
+ .append(
+ $('<div>').attr('class', 'annotation-footer-date overflow-hidden')
+ .append(
+ $('<i>').attr('class', dateIcon)
+ )
+ .append(
+ $('<span>').append(timestampToReadableTime(annotation.timestamp))
+ )
+ )
+
+
+ )
+ )
+ .data('annotation', annotation)
+ .append(function () {
+ if ($('#annotations li').filter( ".listelement" ).length > 0) {
+ return $('<div>').attr('class', 'spacing')
+ }
+ })
+ );
+}
+
+/**
+ * Add a highlighted text at specific position
+ *
+ * @param startCharacter The offset of the start character
+ * @param endCharacter The offset of the end character
+ * @param userId The user id
+ */
+function addHighlightedText(startCharacter, endCharacter, userId) {
+ // create <span> tag with the annotated text
+ var replacement = $('<span></span>').css('background-color', getUserColor(userId)).html(documentText.slice(startCharacter, endCharacter));
+
+ // wrap an <p> tag around the replacement, get its parent (the <p>) and ask for the html
+ var replacementHtml = replacement.wrap('<p/>').parent().html();
+
+ // insert the replacementHtml
+ var newDocument = documentText.slice(0, startCharacter) + replacementHtml + documentText.slice(endCharacter);
+
+ // set new document text
+ $('#documentText').html(newDocument);
+}
+
+/**
+ * Restore the base text
+ */
+function deleteHighlightedText() {
+ $('#documentText').html(documentText);
+}
+
+/**
+ * Get the text value of the selected text
+ *
+ * @returns {string} The text
+ */
+function getSelectedText() {
+ if(window.getSelection){
+ return window.getSelection().toString();
+ }
+ else if(document.getSelection){
+ return document.getSelection();
+ }
+ else if(document.selection){
+ return document.selection.createRange().text;
+ }
+}
+
+/**
+ * Get the text value of the selected text from a textarea
+ *
+ * @returns {string} The text
+ */
+function getSelectedTextFromTextArea() {
+ // if firefox
+ if( navigator.userAgent.toLowerCase().indexOf('firefox') > -1 ){
+ // reference to the textarea
+ var txtarea = document.getElementById("upload-area");
+ // get index of first character
+ var start = txtarea.selectionStart;
+ // get index of last character
+ var end = txtarea.selectionEnd;
+ // return substring from start to end
+ return txtarea.value.substring(start, end);
+ }
+ else if(window.getSelection){
+ return window.getSelection().toString();
+ }
+ else if(document.getSelection){
+ return document.getSelection();
+ }
+ else if(document.selection){
+ return document.selection.createRange().text;
+ }
+}
+
+/**
+ * Get color based on user id
+ *
+ * @param userId The id of the user
+ * @returns {string} The user color
+ */
+function getUserColor(userId) {
+ // insert new color if there is no userId key
+ if (userColors.get(userId) == null) {
+ generateRandomColor(userId);
+ }
+ // return the color
+ return userColors.get(userId);
+}
+
+/**
+ * Get dark color based on user id
+ *
+ * @param userId The id of the user
+ * @returns {string} The dark user color
+ */
+function getDarkUserColor(userId) {
+ // insert new color if there is no userId key
+ if (userColorsDark.get(userId) == null) {
+ generateRandomColor(userId);
+ }
+ // return the color
+ return userColorsDark.get(userId);
+}
+
+/**
+ * Generate a random color of the format 'rgb(r, g, b)'
+ *
+ * @param userId The given user id
+ */
+function generateRandomColor(userId) {
+ var r = Math.floor(Math.random()*56)+170;
+ var g = Math.floor(Math.random()*56)+170;
+ var b = Math.floor(Math.random()*56)+170;
+ var r_d = r - 50;
+ var g_d = g - 50;
+ var b_d = b - 50;
+
+ var color = 'rgb(' + r + ',' + g + ',' + b + ')';
+ var colorDark = 'rgb(' + r_d + ',' + g_d + ',' + b_d + ')';
+
+ userColors.set(userId, color);
+ userColorsDark.set(userId, colorDark);
+}
+
+/**
+ * Calculate and build a readable timestamp from an unix timestamp
+ *
+ * @param timestamp A unix timestamp
+ * @returns {string} A readable timestamp
+ */
+function timestampToReadableTime(timestamp) {
+ // build Date object from timestamp
+ var annotationDate = new Date(timestamp);
+ // declare response
+ var responseTimestamp;
+
+ // if annotation is from today
+ if (isTimestampToday(timestamp)) {
+ // get hours from date
+ var hours = annotationDate.getHours();
+ // get minutes from date
+ var minutes = "0" + annotationDate.getMinutes();
+ // get seconds from date
+ // var seconds = "0" + annotationDate.getSeconds();
+
+ // build readable timestamp
+ responseTimestamp = hours + ":" + minutes.substr(-2);
+ }
+ // else annotation is not from today
+ else {
+ // get date
+ var date = annotationDate.getDate();
+ // get month
+ var month = annotationDate.getMonth();
+ // get year
+ var year = annotationDate.getFullYear();
+
+ // build readable timestamp
+ responseTimestamp = date + "." + month + "." + year;
+ }
+
+ return responseTimestamp;
+}
+
+/**
+ * Check if given timestamp is from today
+ *
+ * @param timestamp The given timestamp in milliseconds
+ * @returns {boolean} Returns true if the timestamp is from today
+ */
+function isTimestampToday(timestamp) {
+ // now
+ var now = new Date();
+ // build Date object from timestamp
+ var date = new Date(timestamp);
+
+ // return true if timestamp is today
+ if (now.getDate() == date.getDate() && now.getMonth() == date.getMonth() && now.getFullYear() == date.getFullYear()) {
+ return true;
+ }
+ else {
+ return false;
+ }
+}
+
+/**
+ * Toggle between the toggle button status
+ *
+ * @param element The given toggle button
+ */
+function toggleButtonHandler(element) {
+ // open and close annotation text
+ element.parent().siblings(".annotation-body").children("p").toggleClass("overflow-hidden");
+ // toggle between up and down button
+ element.children("i").toggleClass("fa-chevron-down fa-chevron-up")
+}
+
+function lockButtonHandler() {
+ var lock = $('#btnLock').children('i')
+ lock.toggleClass("fa-lock-open fa-lock")
+
+ var area = $('#upload-area')
+ if (area.attr('readonly')) {
+ area.attr('readonly', false);
+ }
+ else {
+ area.attr('readonly', true);
+ }
+}
+
+/*
+ MOCKUP FUNCTIONS
+ */
+function randomUserId() {
+ return Math.floor((Math.random() * 12) + 1);;
+}
+
diff --git a/gemeinsamforschen/src/main/webapp/assets/js/viewQuiz.js b/gemeinsamforschen/src/main/webapp/assets/js/viewQuiz.js
new file mode 100644
index 0000000000000000000000000000000000000000..362479e7371bfb8ea4637c238ec8dc0c874b3543
--- /dev/null
+++ b/gemeinsamforschen/src/main/webapp/assets/js/viewQuiz.js
@@ -0,0 +1,67 @@
+$(document).ready(function () {
+ var loading = $('#loadbar').hide();
+ $(document)
+ .ajaxStart(function () {
+ loading.show();
+ }).ajaxStop(function () {
+ loading.hide();
+ });
+
+ $("label.btn").on('click', function () {
+ var choice = $(this).find('input:radio').val();
+ $('#loadbar').show();
+ $('#quiz').fadeOut();
+ setTimeout(function () {
+ $("#answer").html($(this).checking(choice));
+ $('#quiz').show();
+ $('#loadbar').fadeOut();
+ /* something else */
+ }, 1500);
+ });
+
+ $ans = 3;
+
+ $.fn.checking = function (ck) {
+ if (ck != $ans)
+ return 'INCORRECT';
+ else
+ return 'CORRECT';
+ };
+ var parts = window.location.search.substr(1).split("&");
+ var $_GET = {};
+ for (var i = 0; i < parts.length; i++) {
+ var temp = parts[i].split("=");
+ $_GET[decodeURIComponent(temp[0])] = decodeURIComponent(temp[1]);
+ }
+ var quizId = $_GET['quizId'];
+
+ $.ajax({
+ url: '../rest/assessments/project/1/quiz/'+quizId,
+ type: 'GET',
+ success: function (data) {
+ var table = document.getElementById('tableQuiz');
+ var answers = data.correctAnswers.concat(data.incorrectAnswers);
+ var colspan = answers.length;
+ var trQuestion = document.createElement('TR');
+ var question = '<td colspan="' + colspan + '">' + data.question + '</td>';
+ trQuestion.innerHTML = question;
+ var trAnswers = document.createElement('TR');
+ var answersTd = '<div class="quiz" id="quiz" data-toggle="buttons"><td style="display: block;">';
+ for (var i = 0; i < data.correctAnswers.length; i++) {
+ answersTd = answersTd + '<div><label class="element-animation1 btn btn-lg btn-success btn-block"><span class="btn-label"><i class="glyphicon glyphicon-chevron-right"></i></span><input type="checkbox">' + data.correctAnswers[i] + '</label></div>';
+ }
+ for (i = 0; i < data.incorrectAnswers.length; i++) {
+ answersTd = answersTd + '<div><label class="element-animation1 btn btn-lg btn-danger btn-block"><span class="btn-label"><i class="glyphicon glyphicon-chevron-right"></i></span><input type="checkbox">' + data.incorrectAnswers[i] + '</label></div>';
+ }
+ trAnswers.innerHTML = answersTd + '</div></td>';
+ table.appendChild(trQuestion);
+ table.appendChild(trAnswers);
+ },
+ error: function (a, b, c) {
+ alert('Fehler ' + a);
+ }
+ });
+ $("#submitQuiz").on("click", function () {
+
+ });
+});
\ No newline at end of file
diff --git a/gemeinsamforschen/src/main/webapp/index.jsp b/gemeinsamforschen/src/main/webapp/index.jsp
index d8080c2851c0006169ab4a110d99ffd765813e8c..9af1d0e1043f1f5eb65ebcf07875971e42da3cfa 100644
--- a/gemeinsamforschen/src/main/webapp/index.jsp
+++ b/gemeinsamforschen/src/main/webapp/index.jsp
@@ -5,7 +5,7 @@
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
- <title>Gruppenmatcher</title>
+ <title>gemeinsam Forschen</title>
<link rel="stylesheet" href="assets/bootstrap/css/bootstrap.min.css">
<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Ubuntu:400,700">
<link rel="stylesheet" href="assets/css/Login-Form-Clean.css">
diff --git a/gemeinsamforschen/src/main/webapp/pages/Quiz.jsp b/gemeinsamforschen/src/main/webapp/pages/Quiz.jsp
new file mode 100644
index 0000000000000000000000000000000000000000..276a9e024dcc1658c5290b3774cde54dd4029047
--- /dev/null
+++ b/gemeinsamforschen/src/main/webapp/pages/Quiz.jsp
@@ -0,0 +1,54 @@
+<%--
+ Created by IntelliJ IDEA.
+ User: fides-WHK
+ Date: 21.06.2018
+ Time: 12:37
+ To change this template use File | Settings | File Templates.
+--%>
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="menu" %>
+
+<html>
+<head>
+ <meta charset="utf-8">
+ <meta name="viewport" content="width=device-width, initial-scale=1.0">
+ <title>fltrail</title>
+ <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://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>
+ <script src="../assets/js/Quiz.js"></script>
+ <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">
+</head>
+
+<body>
+<div id="wrapper">
+ <menu:menu></menu:menu>
+ <div class="page-content-wrapper">
+ <div class="container-fluid">
+ <h1 id="projectId">project1
+ <a href="#">
+ <span class="glyphicon glyphicon-envelope"
+ style="font-size:27px;margin-top:-17px;margin-left:600px;"></span>
+ </a>
+ <a href="#">
+ <span class="glyphicon glyphicon-cog"
+ style="font-size:29px;margin-left:5px;margin-top:-25px;"></span>
+ </a></h1>
+ </div>
+ <table class="table-striped">
+ <tbody id="myQuizzes">
+
+ </tbody>
+ </table>
+ <button class="btn btn-primary" id="newQuiz">neues Quiz</button>
+
+ </div>
+</div>
+
+</body>
+</html>
diff --git a/gemeinsamforschen/src/main/webapp/pages/annotation-document.jsp b/gemeinsamforschen/src/main/webapp/pages/annotation-document.jsp
index 3e2175d850ccb0404263c14bf6970b3eb5ca17d3..9f2969275d66042918a5d32cd44d1f8044d3d735 100644
--- a/gemeinsamforschen/src/main/webapp/pages/annotation-document.jsp
+++ b/gemeinsamforschen/src/main/webapp/pages/annotation-document.jsp
@@ -1,3 +1,4 @@
+<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="menu"%>
<!DOCTYPE html>
diff --git a/gemeinsamforschen/src/main/webapp/pages/assessmentCalculator.jsp b/gemeinsamforschen/src/main/webapp/pages/assessmentCalculator.jsp
index ded714cfe627d8250322e7a0e1e1bc4b915cc5a1..e8cc29e1bd261c4649369c70ac15a3f6ed4c03d3 100644
--- a/gemeinsamforschen/src/main/webapp/pages/assessmentCalculator.jsp
+++ b/gemeinsamforschen/src/main/webapp/pages/assessmentCalculator.jsp
@@ -1,3 +1,4 @@
+<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="menu"%>
<!DOCTYPE html>
diff --git a/gemeinsamforschen/src/main/webapp/pages/createQuiz.jsp b/gemeinsamforschen/src/main/webapp/pages/createQuiz.jsp
index b9741e2ee9962d42c06531d2052593db0a4a4f4a..ad122bc926c195526ea109c12152f1a24209e498 100644
--- a/gemeinsamforschen/src/main/webapp/pages/createQuiz.jsp
+++ b/gemeinsamforschen/src/main/webapp/pages/createQuiz.jsp
@@ -1,16 +1,49 @@
-<%--
- Created by IntelliJ IDEA.
- User: fides-WHK
- Date: 21.06.2018
- Time: 12:37
- To change this template use File | Settings | File Templates.
---%>
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="menu" %>
+
<html>
<head>
- <title>gemeinsam Forschen</title>
+ <meta charset="utf-8">
+ <meta name="viewport" content="width=device-width, initial-scale=1.0">
+ <title>fltrail</title>
+ <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://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>
+ <script src="../assets/js/createQuiz.js"></script>
+
+ <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">
+
</head>
+
<body>
-<h1>hier werden quizzes vom Dozenten oder Studenten erstellt</h1>
+<div id="wrapper">
+ <menu:menu></menu:menu>
+ <div class="page-content-wrapper">
+ <div class="container-fluid">
+ <h1>Projekt1</h1>
+ <a href="#"><span class="glyphicon glyphicon-envelope"
+ style="font-size:27px;margin-top:-17px;margin-left:600px;"></span></a>
+ <a href="#"><span class="glyphicon glyphicon-cog"
+ style="font-size:29px;margin-left:5px;margin-top:-25px;"></span></a>
+ </div>
+ <div style="margin-left:50px;">
+ <div>
+ <input placeholder="Ihre Frage">
+ </div>
+ <div><label><input type="radio" name="type">Schwierigkeit 3</label></div>
+ <div><label><input type="radio" name="type">Schwierigkeit 2</label></div>
+ <div><label><input type="radio" name="type">Schwierigkeit 1</label></div>
+ <div><input placeholder="korrekte Antwort"><button> + </button><button> - </button></div>
+ <div><input placeholder="inkorrekte Antwort"><button> + </button><button> - </button></div>
+ <button id="save">speichern</button>
+ </div>
+ </div>
+</div>
+
</body>
</html>
diff --git a/gemeinsamforschen/src/main/webapp/pages/enrollProject.jsp b/gemeinsamforschen/src/main/webapp/pages/enrollProject.jsp
new file mode 100644
index 0000000000000000000000000000000000000000..4de718d37303e1c498deb9b562be7b2826f68a4b
--- /dev/null
+++ b/gemeinsamforschen/src/main/webapp/pages/enrollProject.jsp
@@ -0,0 +1,47 @@
+<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %>
+<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="menu" %>
+
+<!DOCTYPE html>
+<html>
+
+<head>
+ <meta name="viewport" content="width=device-width, initial-scale=1.0">
+ <title>fltrail</title>
+ <link rel="stylesheet" href="../assets/css/styles.css">
+ <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css">
+ <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>
+ <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">
+ <script src="../assets/js/utility.js"></script>
+ <script src="../assets/js/enrollProject.js"></script>
+
+</head>
+
+<body>
+<div id="wrapper">
+ <menu:menu></menu:menu>
+ <div class="page-content-wrapper">
+ <div class="container-fluid">
+
+ <h1>Einschreiben in einen Kurs</h1>
+ <a href="#"><span class="glyphicon glyphicon-envelope"
+ style="font-size:27px;margin-top:-17px;margin-left:600px;"></span></a>
+ <a href="#"><span class="glyphicon glyphicon-cog"
+ style="font-size:29px;margin-left:5px;margin-top:-25px;"></span></a>
+ </div>
+ <div style="margin-left: 2%;">
+ <br><br>
+ <label>Projektname: <input placeholder="Projektname"></label>
+ <label>Passwort: <input placeholder="Passwort"></label>
+ </div>
+ <button class="btn btn-default" type="button" id="submit">beitreten</button>
+ </div>
+</div>
+
+
+</body>
+
+</html>
\ No newline at end of file
diff --git a/gemeinsamforschen/src/main/webapp/pages/finalAssessments.jsp b/gemeinsamforschen/src/main/webapp/pages/finalAssessments.jsp
index 52b127d16b895665f442b4c3d13b0e26017f7b07..c63cc625710c9ff8c73e1c8dd7601ade894b3019 100644
--- a/gemeinsamforschen/src/main/webapp/pages/finalAssessments.jsp
+++ b/gemeinsamforschen/src/main/webapp/pages/finalAssessments.jsp
@@ -1,19 +1,21 @@
+<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="menu"%>
<!DOCTYPE html>
<html>
<head>
- <meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>muster-gemeinsam-forschen</title>
+
<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://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/finalAssessment.js"></script>
<link rel="stylesheet" href="../assets/fonts/font-awesome.min.css">
<link rel="stylesheet" href="../assets/css/Community-ChatComments.css">
+ <script src="../assets/js/utility.js"></script>
+ <script src="../assets/js/finalAssessment.js"></script>
<link rel="stylesheet" href="../assets/css/Sidebar-Menu-1.css">
<link rel="stylesheet" href="../assets/css/Sidebar-Menu.css">
</head>
@@ -40,8 +42,7 @@
<h1>Assessment for project1 </h1>
<!-- here will be all the content -->
<div class="container">
- <h2>Carousel Example</h2>
- <div id="myCarousel" class="carousel slide" data-ride="carousel">
+ <div id="myCarousel" class="carousel slide" data-ride="carousel" data-interval="false">
<!-- Indicators -->
<ol class="carousel-indicators">
<li data-target="#myCarousel" data-slide-to="0" class="active"></li>
diff --git a/gemeinsamforschen/src/main/webapp/pages/givefeedback.jsp b/gemeinsamforschen/src/main/webapp/pages/givefeedback.jsp
index 33d96121350b4a003d2382a9f4dc4052091e59b3..c01c2a3c665c4a23f249fac3e5cba112107e885e 100644
--- a/gemeinsamforschen/src/main/webapp/pages/givefeedback.jsp
+++ b/gemeinsamforschen/src/main/webapp/pages/givefeedback.jsp
@@ -1,4 +1,4 @@
-
+<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="menu"%>
<!DOCTYPE html>
diff --git a/gemeinsamforschen/src/main/webapp/pages/overview-docent.html b/gemeinsamforschen/src/main/webapp/pages/overview-docent.html
deleted file mode 100644
index cc9f504b65cee81c9b30aefdae2a72555178b49f..0000000000000000000000000000000000000000
--- a/gemeinsamforschen/src/main/webapp/pages/overview-docent.html
+++ /dev/null
@@ -1,87 +0,0 @@
-<!DOCTYPE html>
-<html>
-
-<head>
- <meta charset="utf-8">
- <meta name="viewport" content="width=device-width, initial-scale=1.0">
- <title>fltrail</title>
- <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://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>
-</head>
-
-<body>
-<h1>Übersicht für Dozent1</h1>
-<a href="#"><span class="glyphicon glyphicon-envelope"
- style="font-size:27px;margin-top:-17px;margin-left:600px;"></span></a>
-<a href="#"><span class="glyphicon glyphicon-cog" style="font-size:29px;margin-left:5px;margin-top:-25px;"></span></a>
-<div>
- <table id="projects"> <!-- getElementById('projects').append um neue Projekte anzufügen -->
- <tr style="cursor:pointer" role="button">
- <td>
- <a id="project1Link">
- <h1>dummy Projekt1</h1>
- </a>
- </td>
- </tr>
- <tr>
- <td>
- <div style="width:100px;"></div>
- <div style="width:741px;">
- <div class="panel panel-default">
- <div class="panel-heading">
- <h3 class="panel-title">Newsfeed </h3>
- </div>
- <div class="panel-body">
- <ul class="list-group">
- <li class="list-group-item">
- <span>erste Abgabe vom Dozenten zu dd.mm.yyyy gefordert</span>
- </li>
- <li class="list-group-item"><span>Beitrag von Student1 wurde hochgeladen</span></li>
- <li class="list-group-item"><span>Gruppe "gemeinsam forschen" rockt das Haus</span></li>
- </ul>
- </div>
- </div>
- </div>
- </td>
- </tr>
- <tr>
- <td></td>
- </tr>
- <tr style="cursor:pointer" role="button">
- <td>
- <a href="project-docent.jsp">
- <h1>dummy Projekt2</h1>
- </a>
- </td>
- </tr>
- <tr>
- <td>
- <div style="width:100px;"></div>
- <div style="width:741px;">
- <div class="panel panel-default">
- <div class="panel-heading">
- <h3 class="panel-title">Newsfeed </h3>
- </div>
- <div class="panel-body">
- <ul class="list-group">
- <li class="list-group-item">
- <span>erste Abgabe vom Dozenten zu dd.mm.yyyy gefordert</span>
- </li>
- <li class="list-group-item"><span>Beitrag von Student1 wurde hochgeladen</span></li>
- <li class="list-group-item"><span>Gruppe "gemeinsam forschen" rockt das Haus</span></li>
- </ul>
- </div>
- </div>
- </div>
- </td>
- </tr>
- </table>
-</div>
-<button class="btn btn-default" type="button" style="margin-left:250px;">Projekt erstellen</button>
-<script src="../assets/js/jquery.min.js"></script>
-<script src="../assets/bootstrap/js/bootstrap.min.js"></script>
-</body>
-
-</html>
\ No newline at end of file
diff --git a/gemeinsamforschen/src/main/webapp/pages/overview-docent.jsp b/gemeinsamforschen/src/main/webapp/pages/overview-docent.jsp
new file mode 100644
index 0000000000000000000000000000000000000000..58a41c269d5f996f98919953b97526573f6dc24e
--- /dev/null
+++ b/gemeinsamforschen/src/main/webapp/pages/overview-docent.jsp
@@ -0,0 +1,105 @@
+<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
+<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="menu" %>
+
+<!DOCTYPE html>
+<html>
+
+<head>
+ <meta charset="utf-8">
+ <meta name="viewport" content="width=device-width, initial-scale=1.0">
+ <title>fltrail</title>
+ <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://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>
+
+ <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">
+</head>
+
+<body>
+<div id="wrapper">
+ <menu:menu></menu:menu>
+ <div class="page-content-wrapper">
+
+ <h1>Übersicht für Dozent1</h1>
+ <a href="#"><span class="glyphicon glyphicon-envelope"
+ style="font-size:27px;margin-top:-17px;margin-left:600px;"></span></a>
+ <a href="#"><span class="glyphicon glyphicon-cog"
+ style="font-size:29px;margin-left:5px;margin-top:-25px;"></span></a>
+ <div>
+ <table id="projects"> <!-- getElementById('projects').append um neue Projekte anzufügen -->
+ <tr class="pageChanger">
+ <td>
+ <a id="project1Link">
+ <h1>dummy Projekt1</h1>
+ </a>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <div style="width:100px;"></div>
+ <div style="width:741px;">
+ <div class="panel panel-default">
+ <div class="panel-heading">
+ <h3 class="panel-title">Newsfeed </h3>
+ </div>
+ <div class="panel-body">
+ <ul class="list-group">
+ <li class="list-group-item">
+ <span>erste Abgabe vom Dozenten zu dd.mm.yyyy gefordert</span>
+ </li>
+ <li class="list-group-item"><span>Beitrag von Student1 wurde hochgeladen</span>
+ </li>
+ <li class="list-group-item">
+ <span>Gruppe "gemeinsam forschen" rockt das Haus</span></li>
+ </ul>
+ </div>
+ </div>
+ </div>
+ </td>
+ </tr>
+ <tr>
+ <td></td>
+ </tr>
+ <tr class="pageChanger">
+ <td>
+ <a href="project-docent.jsp">
+ <h1>dummy Projekt2</h1>
+ </a>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <div style="width:100px;"></div>
+ <div style="width:741px;">
+ <div class="panel panel-default">
+ <div class="panel-heading">
+ <h3 class="panel-title">Newsfeed </h3>
+ </div>
+ <div class="panel-body">
+ <ul class="list-group">
+ <li class="list-group-item">
+ <span>erste Abgabe vom Dozenten zu dd.mm.yyyy gefordert</span>
+ </li>
+ <li class="list-group-item"><span>Beitrag von Student1 wurde hochgeladen</span>
+ </li>
+ <li class="list-group-item">
+ <span>Gruppe "gemeinsam forschen" rockt das Haus</span></li>
+ </ul>
+ </div>
+ </div>
+ </div>
+ </td>
+ </tr>
+ </table>
+ </div>
+ <button class="btn btn-default" type="button" style="margin-left:250px;">Projekt erstellen</button>
+ </div>
+</div>
+
+</body>
+
+</html>
\ No newline at end of file
diff --git a/gemeinsamforschen/src/main/webapp/pages/overview-student.html b/gemeinsamforschen/src/main/webapp/pages/overview-student.html
deleted file mode 100644
index feb1ce71f4f1eefaae7b6ec8bd35341670fafa1c..0000000000000000000000000000000000000000
--- a/gemeinsamforschen/src/main/webapp/pages/overview-student.html
+++ /dev/null
@@ -1,90 +0,0 @@
-<!DOCTYPE html>
-<html>
-
-<head>
- <meta charset="utf-8">
- <meta name="viewport" content="width=device-width, initial-scale=1.0">
- <title>fltrail</title>
- <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://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>
- <script src="../assets/js/overview-student.js"></script>
-
-</head>
-
-<body>
-<h1>Übersicht für Student1</h1>
-<a href="#"><span class="glyphicon glyphicon-envelope"
- style="font-size:27px;margin-top:-17px;margin-left:600px;"></span></a>
-<a href="#"><span class="glyphicon glyphicon-cog" style="font-size:29px;margin-left:5px;margin-top:-25px;"></span></a>
-<div>
- <table id="projects"> <!-- getElementById('projects').append um neue Projekte anzufügen -->
- <tr style="cursor:pointer" role="button">
- <td>
- <a id="project1Link">
- <h1>dummy Projekt1</h1>
- </a>
- </td>
- </tr>
- <tr>
- <td>
- <div style="width:100px;"></div>
- <div style="width:741px;">
- <div class="panel panel-default">
- <div class="panel-heading">
- <h3 class="panel-title">Newsfeed </h3>
- </div>
- <div class="panel-body">
- <ul class="list-group">
- <li class="list-group-item">
- <span>erste Abgabe vom Dozenten zu dd.mm.yyyy gefordert</span>
- </li>
- <li class="list-group-item"><span>Beitrag von Student1 wurde hochgeladen</span></li>
- <li class="list-group-item"><span>Gruppe "gemeinsam forschen" rockt das Haus</span></li>
- </ul>
- </div>
- </div>
- </div>
- </td>
- </tr>
- <tr>
- <td></td>
- </tr>
- <tr style="cursor:pointer" role="button">
- <td>
- <a href="project-docent.jsp">
- <h1>dummy Projekt2</h1>
- </a>
- </td>
- </tr>
- <tr>
- <td>
- <div style="width:100px;"></div>
- <div style="width:741px;">
- <div class="panel panel-default">
- <div class="panel-heading">
- <h3 class="panel-title">Newsfeed </h3>
- </div>
- <div class="panel-body">
- <ul class="list-group">
- <li class="list-group-item">
- <span>erste Abgabe vom Dozenten zu dd.mm.yyyy gefordert</span>
- </li>
- <li class="list-group-item"><span>Beitrag von Student1 wurde hochgeladen</span></li>
- <li class="list-group-item"><span>Gruppe "gemeinsam forschen" rockt das Haus</span></li>
- </ul>
- </div>
- </div>
- </div>
- </td>
- </tr>
- </table>
-</div>
- </div><button class="btn btn-default" type="button" style="margin-left:250px;">Projekt beitreten</button>
- <script src="../assets/js/jquery.min.js"></script>
- <script src="../assets/bootstrap/js/bootstrap.min.js"></script>
-</body>
-
-</html>
\ No newline at end of file
diff --git a/gemeinsamforschen/src/main/webapp/pages/overview-student.jsp b/gemeinsamforschen/src/main/webapp/pages/overview-student.jsp
new file mode 100644
index 0000000000000000000000000000000000000000..ab21d52a2995b2e150d0883d456dd72fce018d53
--- /dev/null
+++ b/gemeinsamforschen/src/main/webapp/pages/overview-student.jsp
@@ -0,0 +1,110 @@
+<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %>
+<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="menu" %>
+
+<!DOCTYPE html>
+<html>
+
+<head>
+ <meta name="viewport" content="width=device-width, initial-scale=1.0">
+ <title>fltrail</title>
+ <link rel="stylesheet" href="../assets/css/styles.css">
+ <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css">
+ <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>
+ <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">
+ <script src="../assets/js/utility.js"></script>
+ <script src="../assets/js/overview-student.js"></script>
+
+</head>
+
+<body>
+<div id="wrapper">
+ <menu:menu></menu:menu>
+ <div class="page-content-wrapper">
+ <div class="container-fluid">
+ <h1>Übersicht für Student1</h1>
+ <a href="#"><span class="glyphicon glyphicon-envelope"
+ style="font-size:27px;margin-top:-17px;margin-left:600px;"></span></a>
+ <a href="#"><span class="glyphicon glyphicon-cog"
+ style="font-size:29px;margin-left:5px;margin-top:-25px;"></span></a>
+ </div>
+ <div>
+ <table id="projects"> <!-- getElementById('projects').append um neue Projekte anzufügen -->
+ <tr class="pageChanger">
+ <td>
+ <a id="project1Link">
+ <h1>dummy Projekt1</h1>
+ </a>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <div style="width:100px;"></div>
+ <div style="width:741px;">
+ <div class="panel panel-default">
+ <div class="panel-heading">
+ <h3 class="panel-title">Newsfeed </h3>
+ Status: abgeschlossen mit Bewertung 2+
+ </div>
+ <div class="panel-body">
+ <ul class="list-group">
+ <li class="list-group-item">
+ <span>erste Abgabe vom Dozenten zu dd.mm.yyyy gefordert</span>
+ </li>
+ <li class="list-group-item"><span>Beitrag von Student1 wurde hochgeladen</span>
+ </li>
+ <li class="list-group-item">
+ <span>Gruppe "gemeinsam forschen" rockt das Haus</span></li>
+ </ul>
+ </div>
+ </div>
+ </div>
+ </td>
+ </tr>
+ <tr>
+ <td></td>
+ </tr>
+ <tr class="pageChanger">
+ <td>
+ <a href="project-student.jsp">
+ <h1>dummy Projekt2</h1>
+ </a>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <div style="width:100px;"></div>
+ <div style="width:741px;">
+ <div class="panel panel-default">
+ <div class="panel-heading">
+ <h3 class="panel-title">Newsfeed </h3>
+ Status: Gruppenbildung
+ </div>
+ <div class="panel-body">
+ <ul class="list-group">
+ <li class="list-group-item">
+ <span>erste Abgabe vom Dozenten zu dd.mm.yyyy gefordert</span>
+ </li>
+ <li class="list-group-item"><span>Beitrag von Student1 wurde hochgeladen</span>
+ </li>
+ <li class="list-group-item">
+ <span>Gruppe "gemeinsam forschen" rockt das Haus</span></li>
+ </ul>
+ </div>
+ </div>
+ </div>
+ </td>
+ </tr>
+ </table>
+ </div>
+ <button class="btn btn-default" type="button" style="margin-left:250px;" id="enrollProject">Projekt beitreten</button>
+ </div>
+</div>
+
+
+</body>
+
+</html>
\ No newline at end of file
diff --git a/gemeinsamforschen/src/main/webapp/pages/project-docent.jsp b/gemeinsamforschen/src/main/webapp/pages/project-docent.jsp
index a67e761165a9ddf5b5d6879c41d2896b9581a771..45033b213503944235b3e3a5d215e5a09b81ff62 100644
--- a/gemeinsamforschen/src/main/webapp/pages/project-docent.jsp
+++ b/gemeinsamforschen/src/main/webapp/pages/project-docent.jsp
@@ -1,5 +1,9 @@
-<!DOCTYPE html>
+<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
<%@ taglib prefix = "communication" uri = "/communication/chatWindow.tld"%>
+<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="menu"%>
+
+
+<!DOCTYPE html>
<html>
<head>
@@ -12,7 +16,13 @@
</head>
<body>
+<div id="wrapper">
+ <menu:menu></menu:menu>
+
+ <div class="page-content-wrapper">
+ <div class="container-fluid">
<h1>dummy Projekt1 für Dozent1</h1><button class="btn btn-default" type="button">Gruppen erstellen</button><button class="btn btn-default" type="button">Projekt finalisieren</button><button class="btn btn-default" type="button">Exportiere Projektergebnisse</button>
+ </div>
<button
class="btn btn-default" type="button">Exportiere Zwischenstand</button><button class="btn btn-default" type="button">Quizfrage erstellen</button>
<div>
@@ -129,6 +139,8 @@
</div>
</div>
</div>
+ </div>
+</div>
<communication:chatWindow orientation="right"></communication:chatWindow>
<script src="../assets/js/jquery.min.js"></script>
<script src="../assets/bootstrap/js/bootstrap.min.js"></script>
diff --git a/gemeinsamforschen/src/main/webapp/pages/project-student.jsp b/gemeinsamforschen/src/main/webapp/pages/project-student.jsp
index 3d3ebf69c1b6e9658076fc7330994dccb49e05fb..99969f2b225d63cb6dddda7a23552eb02b5cc96b 100644
--- a/gemeinsamforschen/src/main/webapp/pages/project-student.jsp
+++ b/gemeinsamforschen/src/main/webapp/pages/project-student.jsp
@@ -1,4 +1,6 @@
+<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
<%--suppress XmlDuplicatedId --%>
+
<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="menu"%>
<!DOCTYPE html>
@@ -10,15 +12,18 @@
<title>muster-gemeinsam-forschen</title>
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css">
<link rel="stylesheet" href="../assets/css/styles.css">
+ <link rel="stylesheet" href="../assets/css/footer.css">
<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>
<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">
+ <script src="../assets/js/footer.js"></script>
<link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.1.0/css/all.css" integrity="sha384-lKuwvrZot6UHsBSfcMvOkWwlCMgc0TaWr+30HWe3a4ltaBwTZhyTEggF5tJv8tbt" crossorigin="anonymous">
<script src="../assets/js/utility.js"></script>
<script src="../assets/js/project-student.js"></script>
+ <script src="../assets/js/Sidebar-Menu.js"></script>
</head>
<body>
@@ -52,7 +57,7 @@
<td id="yourContent">
<h1>Feedbackable Students</h1>
<!-- here will be all the content -->
- <table>
+ <table id="myGroupMembers">
<tr>
<td width="100px" valign="top">
@@ -62,14 +67,16 @@
<hr>
<ul>
- <li><a class="annotationview" role="button">
- Projektuebersicht hochgeladen
- <i class="far fa-comments"></i>
+ <li>
+ Projektübersicht hochgeladen
+ <a class="annotationview" role="button">
+ <label style="font-size:10px;"><i class="far fa-comments" style="font-size:15px;"></i>feedback</label>
</a>
</li>
- <li><a class="annotationview" role="button">
+ <li>
Blumen ins Hausaufgabenheft geklebt
- <i class="far fa-comments"></i>
+ <a class="annotationview" role="button">
+ <label style="font-size:10px;"><i class="far fa-comments" style="font-size:15px;"></i>feedback</label>
</a>
</li>
</a>
@@ -83,18 +90,24 @@
<a href="#">student2@uni.de</a>
<hr>
<ul>
- <li><a class="annotationview" role="button">
- Blumen an Vegetarier verfuettert
- <i class="far fa-comments"></i>
- </a></li>
- <li><a class="annotationview" role="button">
+ <li>
+ Blumen an Vegetarier verfüttert
+ <a class="annotationview" role="button">
+ <label style="font-size:10px;"><i class="far fa-comments" style="font-size:15px;"></i>feedback</label>
+ </a>
+ </li>
+ <li>
Literaturverzeichnis hochgeladen
- <i class="far fa-comments"></i>
- </a></li>
- <li><a class="annotationview" role="button">
+ <a class="annotationview" role="button">
+ <label style="font-size:10px;"><i class="far fa-comments" style="font-size:15px;"></i>feedback</label>
+ </a>
+ </li>
+ <li>
Die armen Vegetarier
- <i class="far fa-comments"></i>
- </a></li>
+ <a class="annotationview" role="button">
+ <label style="font-size:10px;"><i class="far fa-comments" style="font-size:15px;"></i>feedback</label>
+ </a>
+ </li>
</ul>
</td>
<td></td>
@@ -105,9 +118,10 @@
<a href="#">student3@uni.de</a>
<hr>
<ul>
- <li><a class="annotationview" role="button">
+ <li>
"Viva la Floristika" - Titel hochgeladen
- <i class="far fa-comments"></i>
+ <a class="annotationview" role="button">
+ <label style="font-size:10px;"><i class="far fa-comments" style="font-size:15px;"></i>feedback</label>
</a>
</li>
</ul>
@@ -187,11 +201,23 @@
</table>
</div>
</div>
+ <footer>
+ <div class="container">
+ <div class="progress">
+ <div class="progress-bar pg-groups" role="progressbar" id="progressbar">
+ </div>
+ <div>
+ Assessment - Präsentationsphase - Dossier - Reflexionsphase - Feedbackphase - Gruppenbildung
+ </div>
+ <div class="progress-bar pg-rest" role="progressbar">
+ </div>
+ </div>
+ <button id="nextPhase" class="btn btn-light">nächste Phase</button>
+ <button id="btnUnstructuredUpload" class="btn btn-light">Unstrukturierte Abgabe</button>
+ </div>
+ </footer>
</div>
-<script src="../assets/js/jquery.min.js"></script>
-<script src="../assets/bootstrap/js/bootstrap.min.js"></script>
-<script src="../assets/js/Sidebar-Menu.js"></script>
</body>
</html>
\ No newline at end of file
diff --git a/gemeinsamforschen/src/main/webapp/pages/project-student.jsp.orig b/gemeinsamforschen/src/main/webapp/pages/project-student.jsp.orig
new file mode 100644
index 0000000000000000000000000000000000000000..79ff3d3adb039143a4b44e810eddd80c2d1906c6
--- /dev/null
+++ b/gemeinsamforschen/src/main/webapp/pages/project-student.jsp.orig
@@ -0,0 +1,221 @@
+<<<<<<< HEAD
+<%--suppress XmlDuplicatedId --%>
+=======
+<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
+
+>>>>>>> PeerAssessmentAxel
+<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="menu"%>
+
+<!DOCTYPE html>
+<html>
+
+<head>
+ <meta charset="utf-8">
+ <meta name="viewport" content="width=device-width, initial-scale=1.0">
+ <title>muster-gemeinsam-forschen</title>
+ <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css">
+ <link rel="stylesheet" href="../assets/css/styles.css">
+ <link rel="stylesheet" href="../assets/css/footer.css">
+ <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>
+ <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">
+<<<<<<< HEAD
+ <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.1.0/css/all.css" integrity="sha384-lKuwvrZot6UHsBSfcMvOkWwlCMgc0TaWr+30HWe3a4ltaBwTZhyTEggF5tJv8tbt" crossorigin="anonymous">
+ <script src="../assets/js/utility.js"></script>
+ <script src="../assets/js/project-student.js"></script>
+=======
+ <script src="../assets/js/jquery.min.js"></script>
+ <script src="../assets/js/footer.js"></script>
+ <script src="../assets/bootstrap/js/bootstrap.min.js"></script>
+ <script src="../assets/js/Sidebar-Menu.js"></script>
+>>>>>>> PeerAssessmentAxel
+</head>
+
+<body>
+<div id="wrapper">
+ <menu:menu></menu:menu>
+
+ <div class="page-content-wrapper">
+ <div class="container-fluid">
+ <h1 id="projectId">Project 1</h1>
+ </div>
+ <div align="right" class="dropdown">
+ <button style= "position: absolute; right: 50px;" class="btn btn-primary dropdown-toggle" type="button" data-toggle="dropdown">
+
+ <i class="glyphicon glyphicon-envelope"></i>
+ </button>
+
+ <ul class="dropdown-menu">
+ <li><a class="viewfeedback" role="button">Feedback A</a></li>
+ <li><a class="viewfeedback" role="button">Feedback B</a></li>
+ <li><a class="viewfeedback" role="button">Feedback C</a></li>
+ </ul>
+
+ <a href="#">
+ <span class="glyphicon glyphicon-cog" style="font-size:29px;margin-right:30px;margin-top:3px;"></span>
+ </a>
+
+ </div>
+ <div>
+ <table>
+ <tr>
+ <td id="yourContent">
+ <h1>Feedbackable Students</h1>
+ <!-- here will be all the content -->
+ <table>
+ <tr>
+
+ <td width="100px" valign="top">
+ <h3>student1</h3>
+ <img src="../assets/img/1.jpg">
+ <a href="#">student1@uni.de</a>
+ <hr>
+ <ul>
+
+ <li><a class="annotationview" role="button">
+ Projektuebersicht hochgeladen
+ <i class="far fa-comments"></i>
+ </a>
+ </li>
+ <li><a class="annotationview" role="button">
+ Blumen ins Hausaufgabenheft geklebt
+ <i class="far fa-comments"></i>
+ </a>
+ </li>
+ </a>
+ </ul>
+ </td>
+ <td></td>
+
+ <td width="100px" valign="top">
+ <h3>student2</h3>
+ <img src="../assets/img/2.jpg">
+ <a href="#">student2@uni.de</a>
+ <hr>
+ <ul>
+ <li><a class="annotationview" role="button">
+ Blumen an Vegetarier verfuettert
+ <i class="far fa-comments"></i>
+ </a></li>
+ <li><a class="annotationview" role="button">
+ Literaturverzeichnis hochgeladen
+ <i class="far fa-comments"></i>
+ </a></li>
+ <li><a class="annotationview" role="button">
+ Die armen Vegetarier
+ <i class="far fa-comments"></i>
+ </a></li>
+ </ul>
+ </td>
+ <td></td>
+
+ <td width="100px" valign="top">
+ <h3>student3</h3>
+ <img src="../assets/img/3.jpg">
+ <a href="#">student3@uni.de</a>
+ <hr>
+ <ul>
+ <li><a class="annotationview" role="button">
+ "Viva la Floristika" - Titel hochgeladen
+ <i class="far fa-comments"></i>
+ </a>
+ </li>
+ </ul>
+ </td>
+
+ </tr>
+ </table>
+
+ <button onclick="goBack()" class="btn btn-secondary">Zurueck</button>
+
+ <script>
+ function goBack() {
+ window.history.back();
+ }
+ </script>
+
+ </td>
+ <td id="chat">
+ <div class="card">
+ <div class="card-header">
+ <h6 class="mb-0">Gruppen+Projekt Chat</h6>
+ </div>
+ <div class="card-body">
+ <ul class="list-group">
+ <li class="list-group-item">
+ <div class="media">
+ <div></div>
+ <div class="media-body">
+ <div class="media" style="overflow:visible;">
+ <div><img src="../assets/img/1.jpg" class="mr-3"
+ style="width: 25px; height:25px;"></div>
+ <div class="media-body" style="overflow:visible;">
+ <div class="row">
+ <div class="col-md-12">
+ <p><a href="#">Sara Doe:</a> This guy has been going
+ 100+ MPH on side streets. <br>
+ <small class="text-muted">August 6, 2016 @ 10:35am
+ </small>
+ </p>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </li>
+ <li class="list-group-item">
+ <div class="media">
+ <div></div>
+ <div class="media-body">
+ <div class="media" style="overflow:visible;">
+ <div><img src="../assets/img/2.jpg" class="mr-3"
+ style="width: 25px; height:25px;"></div>
+ <div class="media-body" style="overflow:visible;">
+ <div class="row">
+ <div class="col-md-12">
+ <p><a href="#">Brennan Prill:</a> This guy has been
+ going 100+ MPH on side streets. <br>
+ <small class="text-muted">August 6, 2016 @ 10:35am
+ </small>
+ </p>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </li>
+ </ul>
+ <button class="btn btn-light">
+ Add Comment
+ </button>
+ </div>
+ </div>
+ </td>
+ </tr>
+ </table>
+ </div>
+ </div>
+ <footer>
+ <div class="container">
+ <div class="progress">
+ <div class="progress-bar pg-enrollment" role="progressbar" id="progressbar">
+ </div>
+ <div>
+ Assessment - Präsentationsphase - Dossier - Reflexionsphase - Feedbackphase - Gruppenbildung - Kursanmeldung
+ </div>
+ <div class="progress-bar pg-rest" role="progressbar">
+ </div>
+ </div>
+ <button id="nextPhase" class="btn btn-light">nächste Phase</button>
+ </div>
+ </footer>
+</div>
+
+</body>
+
+</html>
\ No newline at end of file
diff --git a/gemeinsamforschen/src/main/webapp/pages/rateContribution.jsp b/gemeinsamforschen/src/main/webapp/pages/rateContribution.jsp
new file mode 100644
index 0000000000000000000000000000000000000000..1cbd97668612b785995299c089e0dc8313a71732
--- /dev/null
+++ b/gemeinsamforschen/src/main/webapp/pages/rateContribution.jsp
@@ -0,0 +1,163 @@
+<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %>
+<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="menu" %>
+<!DOCTYPE html>
+<html>
+
+<head>
+ <meta charset="utf-8">
+ <meta name="viewport" content="width=device-width, initial-scale=1.0">
+ <title>muster-gemeinsam-forschen</title>
+ <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://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="https://cdn.jsdelivr.net/npm/inscrybmde@1.11.3/dist/inscrybmde.min.js"></script>
+ <script src="https://cdn.rawgit.com/showdownjs/showdown/1.8.5/dist/showdown.min.js"></script>
+ <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/inscrybmde@1.11.3/dist/inscrybmde.min.css">
+ <script src="../assets/js/rateContribution.js"></script>
+ <script src="../assets/js/utility.js"></script>
+ <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">
+</head>
+
+<body>
+<div id="wrapper">
+ <menu:menu></menu:menu>
+ <div class="page-content-wrapper">
+ <div class="container-fluid">
+ <h1 id="projectId">project1
+ <a href="#">
+ <span class="glyphicon glyphicon-envelope"
+ style="font-size:27px;margin-top:-17px;margin-left:600px;"></span>
+ </a>
+ <a href="#">
+ <span class="glyphicon glyphicon-cog"
+ style="font-size:29px;margin-left:5px;margin-top:-25px;"></span>
+ </a></h1>
+ </div>
+ <div>
+ <table>
+ <tr>
+ <td id="yourContent">
+ <h1>letzter Schritt im Projekt1 </h1>
+ <table class="table-striped peerStudent"
+ style="width:100%;border:1px solid; margin:auto;" id="student1">
+ <tr>
+ <td align="center">
+ <img src="../assets/img/1.jpg" alt="student1"
+ style="width:20%;">
+ </td>
+ </tr>
+ <tr>
+ <td>
+ Lernzieltagebuch:
+ Lernen ist wie Rudern gegen den Strom. Hört man damit auf, treibt man zurück.
+ <textarea id="ejournalFeedback">
+ meine Bewertung
+ </textarea>
+ <label><input type="radio" name="ejournalRating">Perfekt</label>
+ <label><input type="radio" name="ejournalRating">Makellos</label>
+ <label><input type="radio" name="ejournalRating">regulär</label>
+ <label><input type="radio" name="ejournalRating">Makelhaft</label>
+ <label><input type="radio" name="ejournalRating">Lädiert</label>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ Dossier:
+ Die meisten Menschen sind bereit zu lernen, aber nur die wenigsten, sich belehren zu
+ lassen.
+ <textarea id="dossierFeedback">
+ meine Bewertung
+ </textarea>
+ <label><input type="radio" name="dossierlRating">Perfekt</label>
+ <label><input type="radio" name="dossierRating">Makellos</label>
+ <label><input type="radio" name="dossierRating">regulär</label>
+ <label><input type="radio" name="dossierRating">Makelhaft</label>
+ <label><input type="radio" name="dossierRating">Lädiert</label>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ Präsentation: <a href="#"><i class="fa fa-paperclip"></i></a>
+ <textarea id="presentationFeedback">
+ meine Bewertung
+ </textarea>
+ <label><input type="radio" name="presentationRating">Perfekt</label>
+ <label><input type="radio" name="presentationRating">Makellos</label>
+ <label><input type="radio" name="presentationRating">regulär</label>
+ <label><input type="radio" name="presentationRating">Makelhaft</label>
+ <label><input type="radio" name="presentationRating">Lädiert</label>
+ </td>
+ </tr>
+ </table>
+ <button id="submit" class="btn btn-success">Feedback hochladen</button>
+ </td>
+ <td id="chat">
+ <div class="card">
+ <div class="card-header">
+ <h6 class="mb-0">Gruppen+Projekt Chat</h6>
+ </div>
+ <div class="card-body">
+ <ul class="list-group">
+ <li class="list-group-item">
+ <div class="media">
+ <div></div>
+ <div class="media-body">
+ <div class="media" style="overflow:visible;">
+ <div><img src="../assets/img/1.jpg" class="mr-3"
+ style="width: 25px; height:25px;"></div>
+ <div class="media-body" style="overflow:visible;">
+ <div class="row">
+ <div class="col-md-12">
+ <p><a href="#">Sara Doe:</a> This guy has been going
+ 100+ MPH on side streets. <br>
+ <small class="text-muted">August 6, 2016 @ 10:35am
+ </small>
+ </p>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </li>
+ <li class="list-group-item">
+ <div class="media">
+ <div></div>
+ <div class="media-body">
+ <div class="media" style="overflow:visible;">
+ <div><img src="../assets/img/2.jpg" class="mr-3"
+ style="width: 25px; height:25px;"></div>
+ <div class="media-body" style="overflow:visible;">
+ <div class="row">
+ <div class="col-md-12">
+ <p><a href="#">Brennan Prill:</a> This guy has been
+ going 100+ MPH on side streets. <br>
+ <small class="text-muted">August 6, 2016 @ 10:35am
+ </small>
+ </p>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </li>
+ </ul>
+ <button class="btn btn-light">
+ Add Comment
+ </button>
+ </div>
+ </div>
+ </td>
+ </tr>
+ </table>
+ </div>
+ </div>
+</div>
+</body>
+
+</html>
\ No newline at end of file
diff --git a/gemeinsamforschen/src/main/webapp/pages/specificSkills.jsp b/gemeinsamforschen/src/main/webapp/pages/specificSkills.jsp
new file mode 100644
index 0000000000000000000000000000000000000000..a8add05364b2cc1a7ba26c56a7333e44dc4bf399
--- /dev/null
+++ b/gemeinsamforschen/src/main/webapp/pages/specificSkills.jsp
@@ -0,0 +1,61 @@
+<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %>
+<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="menu" %>
+
+<!DOCTYPE html>
+<html>
+
+<head>
+ <meta name="viewport" content="width=device-width, initial-scale=1.0">
+ <title>fltrail</title>
+ <link rel="stylesheet" href="../assets/css/styles.css">
+ <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css">
+ <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>
+ <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">
+ <script src="../assets/js/utility.js"></script>
+ <script src="../assets/js/specificSkills.js"></script>
+
+</head>
+
+<body>
+<div id="wrapper">
+ <menu:menu></menu:menu>
+ <div class="page-content-wrapper">
+ <div class="container-fluid">
+
+ <h1>Einschreiben in einen Kurs</h1>
+ <a href="#"><span class="glyphicon glyphicon-envelope"
+ style="font-size:27px;margin-top:-17px;margin-left:600px;"></span></a>
+ <a href="#"><span class="glyphicon glyphicon-cog"
+ style="font-size:29px;margin-left:5px;margin-top:-25px;"></span></a>
+ </div>
+ <div align="center">
+ <h2>Wie schätzen Sie sich in folgenden Kategorien ein?</h2>
+ <br><br>
+ <p>groupCriterion1
+ <label>stark<input type="radio" name="groupCriterion1"></label>
+ <input type="radio" name="groupCriterion1">
+ <input type="radio" name="groupCriterion1">
+ <input type="radio" name="groupCriterion1">
+ <label><input type="radio" name="groupCriterion1">schwach</label>
+ </p>
+ <p>groupCriterion2
+ <label>stark<input type="radio" name="groupCriterion2"></label>
+ <input type="radio" name="groupCriterion2">
+ <input type="radio" name="groupCriterion2">
+ <input type="radio" name="groupCriterion2">
+ <label><input type="radio" name="groupCriterion2">schwach</label>
+ </p>
+
+ </div>
+ <button class="btn btn-default" type="button" id="submit">beitreten</button>
+ </div>
+</div>
+
+
+</body>
+
+</html>
\ No newline at end of file
diff --git a/gemeinsamforschen/src/main/webapp/pages/takeQuiz.jsp b/gemeinsamforschen/src/main/webapp/pages/takeQuiz.jsp
index cfda3512312ccec09bdd70ec66a5456405ed26b7..9ddb24242d7dbd999ff642237437caf061612c30 100644
--- a/gemeinsamforschen/src/main/webapp/pages/takeQuiz.jsp
+++ b/gemeinsamforschen/src/main/webapp/pages/takeQuiz.jsp
@@ -1,3 +1,4 @@
+<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="menu"%>
<!DOCTYPE html>
<html>
@@ -11,6 +12,7 @@
<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/takeQuiz.js"></script>
+ <script src="../assets/js/utility.js"></script>
<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">
@@ -18,8 +20,6 @@
</head>
<body>
-
-
<div id="wrapper">
<menu:menu></menu:menu>
<div class="page-content-wrapper">
diff --git a/gemeinsamforschen/src/main/webapp/pages/upload-unstructured.html b/gemeinsamforschen/src/main/webapp/pages/upload-unstructured.html
new file mode 100644
index 0000000000000000000000000000000000000000..092ea377d8a07edd36cb249bbf8fb6d665072304
--- /dev/null
+++ b/gemeinsamforschen/src/main/webapp/pages/upload-unstructured.html
@@ -0,0 +1,93 @@
+<!DOCTYPE html>
+<html>
+
+<head>
+ <meta charset="utf-8">
+ <meta name="viewport" content="width=device-width, initial-scale=1.0">
+ <title>muster-gemeinsam-forschen</title>
+
+ <!-- css - annotationStyle -->
+ <link rel="stylesheet" type="text/css" href="../assets/css/upload-unstructured.css">
+ <!-- css - contextMenu -->
+ <link href="https://swisnl.github.io/jQuery-contextMenu/dist/jquery.contextMenu.css" rel="stylesheet" type="text/css" />
+ <!-- css - bootstrap -->
+ <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css">
+ <!-- css - styles -->
+ <link rel="stylesheet" href="../assets/css/styles.css">
+ <!-- css - font awesome -->
+ <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.1.0/css/all.css" integrity="sha384-lKuwvrZot6UHsBSfcMvOkWwlCMgc0TaWr+30HWe3a4ltaBwTZhyTEggF5tJv8tbt" crossorigin="anonymous">
+ <!-- css - sidebar -->
+ <link rel="stylesheet" href="../assets/css/Sidebar-Menu.css">
+
+ <!-- js - jQuery -->
+ <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.3.1/jquery.min.js"></script>
+ <!-- js - bootstrap -->
+ <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js"></script>
+ <!-- js - jQuery ui position -->
+ <script src="https://cdnjs.cloudflare.com/ajax/libs/jqueryui/1.12.1/jquery-ui.min.js" type="text/javascript"></script>
+ <!-- js - contextMenu script -->
+ <script src="https://swisnl.github.io/jQuery-contextMenu/dist/jquery.contextMenu.js" type="text/javascript"></script>
+ <!-- js - annotationScript -->
+ <script src="../assets/js/uploadUnstructured.js"></script>
+
+</head>
+
+<body>
+<div id="wrapper">
+ <div id="sidebar-wrapper">
+ <ul class="sidebar-nav">
+ <li class="sidebar-brand"><a href="#">overview</a></li>
+ <li><a href="#">Quizfrage</a></li>
+ <li><a href="#">ePortfolio</a></li>
+ <li><a href="#">Beitrag</a></li>
+ <li><a href="#">Bewertung</a></li>
+ <li><a href="#">Logout</a></li>
+ </ul>
+ </div>
+ <div class="page-content-wrapper">
+ <div class="container-fluid">
+ <h1>Unstrukturierte Abgabe
+ <a href="#">
+ <span class="glyphicon glyphicon-envelope"
+ style="font-size:27px;margin-top:-17px;margin-left:600px;"></span>
+ </a>
+ <a href="#">
+ <span class="glyphicon glyphicon-cog" style="font-size:29px;margin-left:5px;margin-top:-25px;"></span>
+ </a>
+ </h1>
+ <div class="mainpage">
+ <div class="leftcolumn">
+ <div class="leftcontent ">
+ <div class="context-menu-one form-group" id="documentText">
+ <label for="upload-area">Texteingabe:</label>
+ <textarea class="unstructured-textarea form-control" rows="20" id="upload-area">
+Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet.
+
+Duis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis at vero eros et accumsan et iusto odio dignissim qui blandit praesent luptatum zzril delenit augue duis dolore te feugait nulla facilisi. Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat.
+
+Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit lobortis nisl ut aliquip ex ea commodo consequat. Duis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis at vero eros et accumsan et iusto odio dignissim qui blandit praesent luptatum zzril delenit augue duis dolore te feugait nulla facilisi.
+
+Nam liber tempor cum soluta nobis eleifend option congue nihil imperdiet doming id quod mazim placerat facer possim assum. Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat. Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit lobortis nisl ut aliquip ex ea commodo consequat.
+
+At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, At accusam aliquyam diam diam dolore dolores duo eirmod eos erat, et nonumy sed tempor et et invidunt justo labore Stet clita ea et gubergren, kasd magna no rebum. sanctus sea sed takimata ut vero voluptua. est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat.
+ </textarea>
+ </div>
+ <div class="document-text-buttons">
+ <button onclick="lockButtonHandler()" type="button" class="btn btn-secondary document-text-buttons-lock" id="btnLock"><i class="fas fa-lock-open" id="lock"></i></button>
+ <button type="button" class="btn btn-secondary document-text-buttons-save" id="btnSave">Speichern</i></button>
+ </div>
+ </div>
+ </div>
+ <div class="rightcolumn">
+ <div class="rightcontent">
+ <ol id="annotations">
+ </ol>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+</div>
+</body>
+
+</html>
\ No newline at end of file
diff --git a/gemeinsamforschen/src/main/webapp/pages/upload-unstructured.jsp b/gemeinsamforschen/src/main/webapp/pages/upload-unstructured.jsp
new file mode 100644
index 0000000000000000000000000000000000000000..98dba6d3b364f74390ee3854c86089c0fec1f224
--- /dev/null
+++ b/gemeinsamforschen/src/main/webapp/pages/upload-unstructured.jsp
@@ -0,0 +1,90 @@
+<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
+<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="menu"%>
+
+<!DOCTYPE html>
+<html>
+
+<head>
+ <meta charset="utf-8">
+ <meta name="viewport" content="width=device-width, initial-scale=1.0">
+ <title>muster-gemeinsam-forschen</title>
+
+ <!-- css - annotationStyle -->
+ <link rel="stylesheet" type="text/css" href="../assets/css/upload-unstructured.css">
+ <!-- css - contextMenu -->
+ <link href="https://swisnl.github.io/jQuery-contextMenu/dist/jquery.contextMenu.css" rel="stylesheet" type="text/css" />
+ <!-- css - bootstrap -->
+ <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css">
+ <!-- css - styles -->
+ <link rel="stylesheet" href="../assets/css/styles.css">
+ <!-- css - font awesome -->
+ <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.1.0/css/all.css" integrity="sha384-lKuwvrZot6UHsBSfcMvOkWwlCMgc0TaWr+30HWe3a4ltaBwTZhyTEggF5tJv8tbt" crossorigin="anonymous">
+ <!-- css - sidebar -->
+ <link rel="stylesheet" href="../assets/css/Sidebar-Menu.css">
+
+ <!-- js - jQuery -->
+ <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.3.1/jquery.min.js"></script>
+ <!-- js - bootstrap -->
+ <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js"></script>
+ <!-- js - jQuery ui position -->
+ <script src="https://cdnjs.cloudflare.com/ajax/libs/jqueryui/1.12.1/jquery-ui.min.js" type="text/javascript"></script>
+ <!-- js - contextMenu script -->
+ <script src="https://swisnl.github.io/jQuery-contextMenu/dist/jquery.contextMenu.js" type="text/javascript"></script>
+ <!-- js - utility script -->
+ <script src="../assets/js/utility.js"></script>
+ <!-- js - annotationScript -->
+ <script src="../assets/js/uploadUnstructured.js"></script>
+
+</head>
+
+<body>
+<div id="wrapper">
+ <menu:menu></menu:menu>
+ <div class="page-content-wrapper">
+ <div class="container-fluid">
+ <h1>Unstrukturierte Abgabe
+ <a href="#">
+ <span class="glyphicon glyphicon-envelope"
+ style="font-size:27px;margin-top:-17px;margin-left:600px;"></span>
+ </a>
+ <a href="#">
+ <span class="glyphicon glyphicon-cog" style="font-size:29px;margin-left:5px;margin-top:-25px;"></span>
+ </a>
+ </h1>
+ <div class="mainpage">
+ <div class="leftcolumn">
+ <div class="leftcontent ">
+ <div class="context-menu-one form-group" id="documentText">
+ <label for="upload-area">Texteingabe:</label>
+ <textarea class="unstructured-textarea form-control" rows="20" id="upload-area">
+Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet.
+
+Duis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis at vero eros et accumsan et iusto odio dignissim qui blandit praesent luptatum zzril delenit augue duis dolore te feugait nulla facilisi. Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat.
+
+Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit lobortis nisl ut aliquip ex ea commodo consequat. Duis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis at vero eros et accumsan et iusto odio dignissim qui blandit praesent luptatum zzril delenit augue duis dolore te feugait nulla facilisi.
+
+Nam liber tempor cum soluta nobis eleifend option congue nihil imperdiet doming id quod mazim placerat facer possim assum. Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat. Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit lobortis nisl ut aliquip ex ea commodo consequat.
+
+At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, At accusam aliquyam diam diam dolore dolores duo eirmod eos erat, et nonumy sed tempor et et invidunt justo labore Stet clita ea et gubergren, kasd magna no rebum. sanctus sea sed takimata ut vero voluptua. est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat.
+ </textarea>
+ </div>
+ <div class="document-text-buttons">
+ <button onclick="lockButtonHandler()" type="button" class="btn btn-secondary document-text-buttons-lock" id="btnLock"><i class="fas fa-lock-open" id="lock"></i></button>
+ <button type="button" class="btn btn-secondary document-text-buttons-back" id="btnBack">Zurück</button>
+ <button type="button" class="btn btn-primary document-text-buttons-save" id="btnSave">Speichern</button>
+ </div>
+ </div>
+ </div>
+ <div class="rightcolumn">
+ <div class="rightcontent">
+ <ol id="annotations">
+ </ol>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+</div>
+</body>
+
+</html>
\ No newline at end of file
diff --git a/gemeinsamforschen/src/main/webapp/pages/viewQuiz.jsp b/gemeinsamforschen/src/main/webapp/pages/viewQuiz.jsp
new file mode 100644
index 0000000000000000000000000000000000000000..a484d9381f9a963ff485ca311cae45714c357b14
--- /dev/null
+++ b/gemeinsamforschen/src/main/webapp/pages/viewQuiz.jsp
@@ -0,0 +1,115 @@
+<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
+<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="menu"%>
+<!DOCTYPE html>
+<html>
+
+<head>
+ <meta charset="utf-8">
+ <meta name="viewport" content="width=device-width, initial-scale=1.0">
+ <title>muster-gemeinsam-forschen</title>
+ <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://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/viewQuiz.js"></script>
+ <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">
+</head>
+
+<body>
+
+
+<div id="wrapper">
+ <menu:menu></menu:menu>
+ <div class="page-content-wrapper">
+ <div class="container-fluid">
+ <h1 id="projectId">project1
+ <a href="#">
+ <span class="glyphicon glyphicon-envelope"
+ style="font-size:27px;margin-top:-17px;margin-left:600px;"></span>
+ </a>
+ <a href="#">
+ <span class="glyphicon glyphicon-cog" style="font-size:29px;margin-left:5px;margin-top:-25px;"></span>
+ </a></h1>
+ </div>
+ <div>
+ <table>
+ <tr>
+ <td id="yourContent">
+ <h1>Quiz for project1 </h1>
+ <!-- here will be all the content -->
+ <table class="table-striped">
+ <tbody id="tableQuiz">
+
+ </tbody>
+ </table>
+ <button id="deleteQuiz" class="btn btn-danger">Quiz löschen</button>
+ </td>
+ <td id="chat">
+ <div class="card">
+ <div class="card-header">
+ <h6 class="mb-0">Gruppen+Projekt Chat</h6>
+ </div>
+ <div class="card-body">
+ <ul class="list-group">
+ <li class="list-group-item">
+ <div class="media">
+ <div></div>
+ <div class="media-body">
+ <div class="media" style="overflow:visible;">
+ <div><img src="../assets/img/1.jpg" class="mr-3"
+ style="width: 25px; height:25px;"></div>
+ <div class="media-body" style="overflow:visible;">
+ <div class="row">
+ <div class="col-md-12">
+ <p><a href="#">Sara Doe:</a> This guy has been going
+ 100+ MPH on side streets. <br>
+ <small class="text-muted">August 6, 2016 @ 10:35am
+ </small>
+ </p>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </li>
+ <li class="list-group-item">
+ <div class="media">
+ <div></div>
+ <div class="media-body">
+ <div class="media" style="overflow:visible;">
+ <div><img src="../assets/img/2.jpg" class="mr-3"
+ style="width: 25px; height:25px;"></div>
+ <div class="media-body" style="overflow:visible;">
+ <div class="row">
+ <div class="col-md-12">
+ <p><a href="#">Brennan Prill:</a> This guy has been
+ going 100+ MPH on side streets. <br>
+ <small class="text-muted">August 6, 2016 @ 10:35am
+ </small>
+ </p>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </li>
+ </ul>
+ <button class="btn btn-light">
+ Add Comment
+ </button>
+ </div>
+ </div>
+ </td>
+ </tr>
+ </table>
+ </div>
+ </div>
+</div>
+</body>
+
+</html>
\ No newline at end of file
diff --git a/gemeinsamforschen/src/main/webapp/pages/viewfeedback.jsp b/gemeinsamforschen/src/main/webapp/pages/viewfeedback.jsp
index a6314029f73d42ff095ae48d99f435b67b0acb82..7782962570fe23549d27559bf209c1eeb53695af 100644
--- a/gemeinsamforschen/src/main/webapp/pages/viewfeedback.jsp
+++ b/gemeinsamforschen/src/main/webapp/pages/viewfeedback.jsp
@@ -1,4 +1,4 @@
-
+<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="menu"%>
<!DOCTYPE html>
diff --git a/gemeinsamforschen/src/scripts/dbschema/fltrail.sql b/gemeinsamforschen/src/scripts/dbschema/fltrail.sql
index a930e3f00837538d9e256dc9e008add7e1c3de8d..717dbcde085d2926a7c2abd9963a752edcdddd96 100644
--- a/gemeinsamforschen/src/scripts/dbschema/fltrail.sql
+++ b/gemeinsamforschen/src/scripts/dbschema/fltrail.sql
@@ -75,4 +75,14 @@ CREATE TABLE `annotations` (
alter table users
add isStudent tinyint(1) default '1' null;
-
+CREATE TABLE if not exists quiz
+(
+ author varchar(400) NOT NULL,
+ projectId varchar(400) NOT NULL,
+ question varchar(400) NOT NULL,
+ mcType varchar(400) NOT NULL,
+ answer varchar(400) NOT NULL,
+ correct tinyint(1) NOT NULL
+)
+ ENGINE = InnoDB
+ DEFAULT CHARSET = utf8;
\ No newline at end of file