From eff28114462b41756dba7d1a6b0fa23813fa9e10 Mon Sep 17 00:00:00 2001
From: Axel <wiepke@uni-potsdam.de>
Date: Thu, 28 Jun 2018 09:24:34 +0200
Subject: [PATCH] feat: Quiz-pages are done in raw form.
feat: db reworked for quizzes.
---
.../gf/core/management/user/Menu.java | 4 +-
.../gf/interfaces/IPeerAssessment.java | 4 +-
.../controller/service/FBAssessement.java | 2 +-
.../controller/service/PeerAssessment.java | 2 +-
.../service/PeerAssessmentDummy.java | 12 +-
.../assessment/controller/view/QuizView.java | 5 +-
.../src/main/webapp/assets/css/styles.css | 4 +
.../src/main/webapp/assets/js/Quiz.js | 26 ++++
.../main/webapp/assets/js/finalAssessment.js | 8 +-
.../src/main/webapp/assets/js/viewQuiz.js | 67 ++++++++++
.../src/main/webapp/pages/Quiz.jsp | 54 ++++++++
.../src/main/webapp/pages/createQuiz.jsp | 31 ++++-
.../main/webapp/pages/finalAssessments.jsp | 5 +-
.../src/main/webapp/pages/overview-docent.jsp | 4 +-
.../main/webapp/pages/overview-student.jsp | 4 +-
.../src/main/webapp/pages/project-docent.jsp | 14 ++-
.../src/main/webapp/pages/project-student.jsp | 2 +
.../src/main/webapp/pages/takeQuiz.jsp | 2 -
.../src/main/webapp/pages/viewQuiz.jsp | 115 ++++++++++++++++++
.../src/scripts/dbschema/fltrail.sql | 12 +-
20 files changed, 350 insertions(+), 27 deletions(-)
create mode 100644 gemeinsamforschen/src/main/webapp/assets/js/Quiz.js
create mode 100644 gemeinsamforschen/src/main/webapp/assets/js/viewQuiz.js
create mode 100644 gemeinsamforschen/src/main/webapp/pages/Quiz.jsp
create mode 100644 gemeinsamforschen/src/main/webapp/pages/viewQuiz.jsp
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 bac4c6b3..8ac3bfef 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
@@ -23,7 +23,7 @@ public class Menu extends SimpleTagSupport {
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=\"takeQuiz.jsp?token="+token+"\">Quizfrage</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=\"finalAssessments.jsp?token="+token+"\">Bewertung</a></li>\n" +
@@ -34,7 +34,7 @@ public class Menu extends SimpleTagSupport {
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=\"createQuiz.jsp?token="+token+"\">Quizfrage</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" +
diff --git a/gemeinsamforschen/src/main/java/unipotsdam/gf/interfaces/IPeerAssessment.java b/gemeinsamforschen/src/main/java/unipotsdam/gf/interfaces/IPeerAssessment.java
index 9a23d8f4..e3b65f14 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 3368ce83..df592667 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 418f4fed..6c427c4b 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 6d7e9339..9de14e21 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 077ebb23..4c80528c 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/styles.css b/gemeinsamforschen/src/main/webapp/assets/css/styles.css
index b4a3cba5..fffdfbf2 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/js/Quiz.js b/gemeinsamforschen/src/main/webapp/assets/js/Quiz.js
new file mode 100644
index 00000000..afd43343
--- /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/finalAssessment.js b/gemeinsamforschen/src/main/webapp/assets/js/finalAssessment.js
index a42d6489..3f872ecd 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,8 @@ function assessPeer(){
},
data: JSON.stringify(dataP),
success: function(){
-
+ alert("hier bin ich richtig");
+ location.href="takeQuiz.jsp?"+getUserTokenFromUrl();
},
error: function(a,b,c){
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 00000000..362479e7
--- /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/pages/Quiz.jsp b/gemeinsamforschen/src/main/webapp/pages/Quiz.jsp
new file mode 100644
index 00000000..276a9e02
--- /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/createQuiz.jsp b/gemeinsamforschen/src/main/webapp/pages/createQuiz.jsp
index b9741e2e..08664139 100644
--- a/gemeinsamforschen/src/main/webapp/pages/createQuiz.jsp
+++ b/gemeinsamforschen/src/main/webapp/pages/createQuiz.jsp
@@ -6,11 +6,38 @@
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>
+
+ <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">
+ <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 align="center">
+
+ </div>
+ </div>
+</div>
+
</body>
</html>
diff --git a/gemeinsamforschen/src/main/webapp/pages/finalAssessments.jsp b/gemeinsamforschen/src/main/webapp/pages/finalAssessments.jsp
index 29d953e8..7660147d 100644
--- a/gemeinsamforschen/src/main/webapp/pages/finalAssessments.jsp
+++ b/gemeinsamforschen/src/main/webapp/pages/finalAssessments.jsp
@@ -8,13 +8,14 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>muster-gemeinsam-forschen</title>
- <script src="../assets/js/finalAssessment.js"></script>
<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">
+ <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>
@@ -42,7 +43,7 @@
<!-- 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/overview-docent.jsp b/gemeinsamforschen/src/main/webapp/pages/overview-docent.jsp
index 3b51adde..58a41c26 100644
--- a/gemeinsamforschen/src/main/webapp/pages/overview-docent.jsp
+++ b/gemeinsamforschen/src/main/webapp/pages/overview-docent.jsp
@@ -31,7 +31,7 @@
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">
+ <tr class="pageChanger">
<td>
<a id="project1Link">
<h1>dummy Projekt1</h1>
@@ -64,7 +64,7 @@
<tr>
<td></td>
</tr>
- <tr style="cursor:pointer" role="button">
+ <tr class="pageChanger">
<td>
<a href="project-docent.jsp">
<h1>dummy Projekt2</h1>
diff --git a/gemeinsamforschen/src/main/webapp/pages/overview-student.jsp b/gemeinsamforschen/src/main/webapp/pages/overview-student.jsp
index fd000e5e..d2901ab7 100644
--- a/gemeinsamforschen/src/main/webapp/pages/overview-student.jsp
+++ b/gemeinsamforschen/src/main/webapp/pages/overview-student.jsp
@@ -32,7 +32,7 @@
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">
+ <tr class="pageChanger">
<td>
<a id="project1Link">
<h1>dummy Projekt1</h1>
@@ -65,7 +65,7 @@
<tr>
<td></td>
</tr>
- <tr style="cursor:pointer" role="button">
+ <tr class="pageChanger">
<td>
<a href="project-docent.jsp">
<h1>dummy Projekt2</h1>
diff --git a/gemeinsamforschen/src/main/webapp/pages/project-docent.jsp b/gemeinsamforschen/src/main/webapp/pages/project-docent.jsp
index a67e7611..45033b21 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 56d20300..2027a814 100644
--- a/gemeinsamforschen/src/main/webapp/pages/project-student.jsp
+++ b/gemeinsamforschen/src/main/webapp/pages/project-student.jsp
@@ -1,3 +1,5 @@
+<%@ 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/takeQuiz.jsp b/gemeinsamforschen/src/main/webapp/pages/takeQuiz.jsp
index 6cde5329..8660de2b 100644
--- a/gemeinsamforschen/src/main/webapp/pages/takeQuiz.jsp
+++ b/gemeinsamforschen/src/main/webapp/pages/takeQuiz.jsp
@@ -19,8 +19,6 @@
</head>
<body>
-
-
<div id="wrapper">
<menu:menu></menu:menu>
<div class="page-content-wrapper">
diff --git a/gemeinsamforschen/src/main/webapp/pages/viewQuiz.jsp b/gemeinsamforschen/src/main/webapp/pages/viewQuiz.jsp
new file mode 100644
index 00000000..a484d938
--- /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/scripts/dbschema/fltrail.sql b/gemeinsamforschen/src/scripts/dbschema/fltrail.sql
index c92c03da..a9592645 100644
--- a/gemeinsamforschen/src/scripts/dbschema/fltrail.sql
+++ b/gemeinsamforschen/src/scripts/dbschema/fltrail.sql
@@ -64,4 +64,14 @@ CREATE TABLE if not exists projectuser
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
--
GitLab