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 f5ccb7490771953ed577159aef335bc032e59f00..ced3fed6a0632ac3deaeb2e05a61473a18be73d6 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
@@ -14,6 +14,7 @@ public class Menu extends SimpleTagSupport {
PageContext pageContext = (PageContext) getJspContext();
HttpServletRequest request = (HttpServletRequest) pageContext.getRequest();
String token = request.getParameter("token");
+ String projectId = request.getParameter("projectId");
ManagementImpl management = new ManagementImpl();
JspWriter out = getJspContext().getOut();
if (token!=null){
@@ -22,20 +23,20 @@ public class Menu extends SimpleTagSupport {
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=\"profile.jsp?token="+token+"\">Profil</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=\"researchReportTitle.jsp?token="+token+"\">Beitrag</a></li>\n" +
- " <li><a href=\"finalAssessments.jsp?token="+token+"\">Bewertung</a></li>\n" +
+ " <li class=\"sidebar-brand\"><a href=\"overview-student.jsp?token="+token+"&projectId="+projectId+"\">overview</a></li>\n" +
+ " <li><a href=\"profile.jsp?token="+token+"&projectId="+projectId+"\">Profil</a></li>\n" +
+ " <li><a href=\"Quiz.jsp?token="+token+"&projectId="+projectId+"\">Quizfrage</a></li>\n" +
+ " <li><a href=\"eportfolio.jsp?token="+token+"&projectId="+projectId+"\">ePortfolio</a></li>\n" +
+ " <li><a href=\"researchReportTitle.jsp?token="+token+"&projectId="+projectId+"\">Beitrag</a></li>\n" +
+ " <li><a href=\"finalAssessments.jsp?token="+token+"&projectId="+projectId+"\">Bewertung</a></li>\n" +
" <li><a href=\"../index.jsp\">Logout</a></li>\n" +
" </ul>\n" +
" </div>");
} else {
out.println("<div id=\"sidebar-wrapper\">\n" +
" <ul class=\"sidebar-nav\">\n" +
- " <li class=\"sidebar-brand\"><a href=\"overview-docent.jsp?token="+token+"\">overview</a></li>\n" +
- " <li><a href=\"Quiz.jsp?token="+token+"\">Quizfrage</a></li>\n" +
+ " <li class=\"sidebar-brand\"><a href=\"overview-docent.jsp?token="+token+"&projectId="+projectId+"\">overview</a></li>\n" +
+ " <li><a href=\"Quiz.jsp?token="+token+"&projectId="+projectId+"\">Quizfrage</a></li>\n" +
" <li><a href=\"#\">ePortfolio</a></li>\n" +
" <li><a href=\"#\">Beitrag</a></li>\n" +
" <li><a href=\"#\">Gruppen erstellen</a></li>\n" +
@@ -51,6 +52,11 @@ public class Menu extends SimpleTagSupport {
"</div>");
//in active System this will be the point to redirect to index.jsp, because token is "wrong"
}
+ if (projectId!=null)
+ out.println("<p id=\"projectId\" hidden>"+projectId+"</p>");
+ User user = management.getUserByToken(token);
+ if (user != null)
+ out.println("<p id=\"user\" hidden>"+user.getName()+"</p>");
}
diff --git a/gemeinsamforschen/src/main/java/unipotsdam/gf/core/management/user/headLine.java b/gemeinsamforschen/src/main/java/unipotsdam/gf/core/management/user/headLine.java
new file mode 100644
index 0000000000000000000000000000000000000000..5286e026565364393a3a680ff3c9484616202aa8
--- /dev/null
+++ b/gemeinsamforschen/src/main/java/unipotsdam/gf/core/management/user/headLine.java
@@ -0,0 +1,46 @@
+package unipotsdam.gf.core.management.user;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.jsp.JspException;
+import javax.servlet.jsp.JspWriter;
+import javax.servlet.jsp.PageContext;
+import javax.servlet.jsp.tagext.SimpleTagSupport;
+import java.io.IOException;
+
+public class headLine extends SimpleTagSupport {
+ public void doTag() throws JspException, IOException {
+ PageContext pageContext = (PageContext) getJspContext();
+ HttpServletRequest request = (HttpServletRequest) pageContext.getRequest();
+ String projectId = request.getParameter("projectId");
+ JspWriter out = getJspContext().getOut();
+ out.println("<div class=\"container-fluid\">\n" +
+ " <table style=\"width:100%\">\n" +
+ " <tr>\n" +
+ " <td style=\"width:70%\"><h2 id=\"headLineProject\"></h2></td>\n" +
+ " <td style=\"width:30%\">\n" +
+ " <div align=\"right\" class=\"dropdown\">\n" +
+ " <button style=\"right: 50px;margin-top:-4px;\" class=\"btn btn-primary dropdown-toggle\" type=\"button\"\n" +
+ " data-toggle=\"dropdown\">\n" +
+ "\n" +
+ " <i class=\"glyphicon glyphicon-envelope\"></i>\n" +
+ " </button>\n" +
+ "\n" +
+ " <ul class=\"dropdown-menu\">\n" +
+ " <li><a class=\"viewfeedback\" role=\"button\">Feedback A</a></li>\n" +
+ " <li><a class=\"viewfeedback\" role=\"button\">Feedback B</a></li>\n" +
+ " <li><a class=\"viewfeedback\" role=\"button\">Feedback C</a></li>\n" +
+ " </ul>\n" +
+ "\n" +
+ " <a href=\"#\">\n" +
+ " <span class=\"glyphicon glyphicon-cog\"\n" +
+ " style=\"font-size:29px;margin-right:30px;\"></span>\n" +
+ " </a>\n" +
+ " </div>\n" +
+ " </td>\n" +
+ " </tr>\n" +
+ " </table>\n" +
+ " </div>");
+ }
+
+
+};
\ No newline at end of file
diff --git a/gemeinsamforschen/src/main/java/unipotsdam/gf/core/management/user/omniDependencies.java b/gemeinsamforschen/src/main/java/unipotsdam/gf/core/management/user/omniDependencies.java
new file mode 100644
index 0000000000000000000000000000000000000000..e4b3272b2dac3479a79f5271598981a0e04db3d6
--- /dev/null
+++ b/gemeinsamforschen/src/main/java/unipotsdam/gf/core/management/user/omniDependencies.java
@@ -0,0 +1,35 @@
+package unipotsdam.gf.core.management.user;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.jsp.JspException;
+import javax.servlet.jsp.JspWriter;
+import javax.servlet.jsp.PageContext;
+import javax.servlet.jsp.tagext.SimpleTagSupport;
+import java.io.IOException;
+
+public class omniDependencies extends SimpleTagSupport {
+ public void doTag() throws JspException, IOException {
+ PageContext pageContext = (PageContext) getJspContext();
+ HttpServletRequest request = (HttpServletRequest) pageContext.getRequest();
+ String projectId = request.getParameter("projectId");
+ JspWriter out = getJspContext().getOut();
+ out.println("<meta charset=\"utf-8\">\n" +
+ " <meta name=\"viewport\" content=\"width=device-width, initial-scale=1.0\">\n" +
+ " <title>fltrail</title>\n" +
+ " <link rel=\"stylesheet\" href=\"https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css\">\n" +
+ " <link rel=\"stylesheet\" href=\"../assets/css/styles.css\">\n" +
+ " <link rel=\"stylesheet\" href=\"../assets/css/footer.css\">\n" +
+ " <script src=\"https://ajax.googleapis.com/ajax/libs/jquery/3.3.1/jquery.min.js\"></script>\n" +
+ " <script src=\"https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js\"></script>\n" +
+ " <link rel=\"stylesheet\" href=\"../assets/fonts/font-awesome.min.css\">\n" +
+ " <link rel=\"stylesheet\" href=\"../assets/css/Sidebar-Menu-1.css\">\n" +
+ " <link rel=\"stylesheet\" href=\"../assets/css/Sidebar-Menu.css\">\n" +
+ " <script src=\"../assets/js/Sidebar-Menu.js\"></script>\n" +
+ " <script src=\"../assets/js/utility.js\"></script>\n" +
+ " <script src=\"../assets/js/footer.js\"></script>\n" +
+ " <link rel=\"stylesheet\" href=\"https://use.fontawesome.com/releases/v5.1.0/css/all.css\"\n" +
+ " integrity=\"sha384-lKuwvrZot6UHsBSfcMvOkWwlCMgc0TaWr+30HWe3a4ltaBwTZhyTEggF5tJv8tbt\" crossorigin=\"anonymous\">");
+ }
+
+
+};
\ No newline at end of file
diff --git a/gemeinsamforschen/src/main/java/unipotsdam/gf/interfaces/IPeerAssessment.java b/gemeinsamforschen/src/main/java/unipotsdam/gf/interfaces/IPeerAssessment.java
index 57c44dc26897fbd95778842adabee369a851734a..072a48ab715f159f905889972f53db420828ae52 100644
--- a/gemeinsamforschen/src/main/java/unipotsdam/gf/interfaces/IPeerAssessment.java
+++ b/gemeinsamforschen/src/main/java/unipotsdam/gf/interfaces/IPeerAssessment.java
@@ -17,7 +17,7 @@ public interface IPeerAssessment {
*/
void addAssessmentDataToDB(Assessment assessment);
- Quiz getQuiz(String projectId, String groupId);
+ Quiz getQuiz(String projectId, String groupId, String author);
/**
* will return a saved assessment from the DB
*
@@ -56,7 +56,7 @@ public interface IPeerAssessment {
* @param ProjectId
* @return
*/
- int meanOfAssessement(String ProjectId);
+ int meanOfAssessment(String ProjectId);
/**
* returns all quizzes in a project
diff --git a/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/assessment/controller/model/StudentAndQuiz.java b/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/assessment/controller/model/StudentAndQuiz.java
index 4f5f5c0976bffc1bc51602c7c1cc886f294ac1d5..8031ca7b45883662c26320b47ac9a0ae3549678a 100644
--- a/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/assessment/controller/model/StudentAndQuiz.java
+++ b/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/assessment/controller/model/StudentAndQuiz.java
@@ -1,6 +1,9 @@
package unipotsdam.gf.modules.assessment.controller.model;
public class StudentAndQuiz {
+ private Quiz quiz;
+ private StudentIdentifier studentIdentifier;
+
@Override
public String toString() {
return "StudentAndQuiz{" +
@@ -11,8 +14,6 @@ public class StudentAndQuiz {
public StudentAndQuiz(){}
- private StudentIdentifier studentIdentifier;
-
public StudentIdentifier getStudentIdentifier() {
return studentIdentifier;
}
@@ -29,8 +30,6 @@ public class StudentAndQuiz {
this.quiz = quiz;
}
- private Quiz quiz;
-
public StudentAndQuiz(StudentIdentifier studentIdentifier, Quiz quiz) {
this.studentIdentifier = studentIdentifier;
this.quiz = quiz;
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 2aa7c041e2a82668dde699242f53ab9b5ca0c973..413b9eaee81d27e0ead74b8cdf3958f28d3a4038 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
@@ -16,7 +16,7 @@ public class FBAssessement extends AssessmentDAO {
}
@Override
- public Quiz getQuiz(String projectId, String groupId) {
+ public Quiz getQuiz(String projectId, String groupId, String author) {
return null;
}
@@ -44,7 +44,7 @@ public class FBAssessement extends AssessmentDAO {
}
@Override
- public int meanOfAssessement(String projectId) {
+ public int meanOfAssessment(String projectId) {
return 0;
}
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 afdc97159edaa6c53a1564f4924fb64f292a00b5..6882f4c2b7a96c8eac21e8d9e1a3a18615fdfe5c 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
@@ -15,8 +15,8 @@ public class PeerAssessment implements IPeerAssessment {
}
@Override//returns one quiz
- public Quiz getQuiz(String projectId, String quizId) {
- return new QuizDBCommunication().getQuizByProjectGroupId(projectId,quizId);
+ public Quiz getQuiz(String projectId, String quizId, String author) {
+ return new QuizDBCommunication().getQuizByProjectQuizId(projectId, quizId, author);
}
@Override //returns all quizzes in the course
@@ -31,7 +31,7 @@ public class PeerAssessment implements IPeerAssessment {
@Override
public void createQuiz(StudentAndQuiz studentAndQuiz) {
-
+ new QuizDBCommunication().createQuiz(studentAndQuiz.getQuiz(),studentAndQuiz.getStudentIdentifier().getStudentId(), studentAndQuiz.getStudentIdentifier().getProjectId());
}
@Override
@@ -50,7 +50,7 @@ public class PeerAssessment implements IPeerAssessment {
}
@Override
- public int meanOfAssessement(String ProjectId) {
+ public int meanOfAssessment(String ProjectId) {
return 0;
}
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 b78a211844935fd3c0a641c073a4f6533ed529da..efe2cd75b1b0070ab0b7750611387b6c1fcb6236 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
@@ -13,7 +13,7 @@ public class PeerAssessmentDummy implements IPeerAssessment {
}
@Override
- public Quiz getQuiz(String projectId, String quizId) {
+ public Quiz getQuiz(String projectId, String quizId, String author) {
ArrayList<String> correctAnswers = new ArrayList<String>();
ArrayList<String> incorrectAnswers = new ArrayList<String>();
Quiz sampleQuiz;
@@ -118,7 +118,7 @@ public class PeerAssessmentDummy implements IPeerAssessment {
}
@Override
- public int meanOfAssessement(String ProjectId) {
+ public int meanOfAssessment(String ProjectId) {
return 0;
}
}
diff --git a/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/assessment/controller/service/QuizDBCommunication.java b/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/assessment/controller/service/QuizDBCommunication.java
index fc0fdc32226fb3c8f10b69c6b8292fe5e2c90dd8..fb28cc96451c008045135cfcda547a663be23d45 100644
--- a/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/assessment/controller/service/QuizDBCommunication.java
+++ b/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/assessment/controller/service/QuizDBCommunication.java
@@ -14,12 +14,12 @@ import java.util.ArrayList;
@Resource
@Singleton
public class QuizDBCommunication {
- public Quiz getQuizByProjectGroupId(String projectId, String quizId){
+ public Quiz getQuizByProjectQuizId(String projectId, String quizId, String author){
MysqlConnect connect = new MysqlConnect();
connect.connect();
- String mysqlRequest = "SELECT * FROM quiz where projectId=? AND question=?";
+ String mysqlRequest = "SELECT * FROM `quiz` WHERE `projectId`=? AND `question`=? AND `author`=?";
VereinfachtesResultSet vereinfachtesResultSet =
- connect.issueSelectStatement(mysqlRequest, projectId,quizId);
+ connect.issueSelectStatement(mysqlRequest, projectId,quizId,author);
boolean next = vereinfachtesResultSet.next();
String question = "";
ArrayList<String> correctAnswers = new ArrayList<String>();
@@ -94,4 +94,32 @@ public class QuizDBCommunication {
connect.issueInsertOrDeleteStatement(mysqlRequest, quizId);
connect.close();
}
+
+ public void createQuiz(Quiz quiz, String author, String projectId) {
+ MysqlConnect connect = new MysqlConnect();
+ connect.connect();
+ String mcType;
+ String question;
+ String answer;
+ boolean correct;
+ ArrayList<String> correctAnswers = quiz.getCorrectAnswers();
+ for (int i=0; i<correctAnswers.size(); i++) {
+ answer = correctAnswers.get(i);
+ mcType = quiz.getType();
+ question = quiz.getQuestion();
+ correct = true;
+ String mysqlRequest = "INSERT INTO `quiz`(`author`, `projectId`, `question`, `mcType`, `answer`, `correct`) VALUES (?,?,?,?,?,?)";
+ connect.issueInsertOrDeleteStatement(mysqlRequest, author, projectId, question, mcType, answer, correct);
+ }
+ ArrayList<String> incorrectAnswers = quiz.getIncorrectAnswers();
+ for (int i=0; i<incorrectAnswers.size(); i++) {
+ answer = incorrectAnswers.get(i);
+ mcType = quiz.getType();
+ question = quiz.getQuestion();
+ correct = false;
+ String mysqlRequest = "INSERT INTO `quiz`(`author`, `projectId`, `question`, `mcType`, `answer`, `correct`) VALUES (?,?,?,?,?,?)";
+ connect.issueInsertOrDeleteStatement(mysqlRequest, author, projectId, question, mcType, answer, correct);
+ }
+ connect.close();
+ }
}
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 fe4dda4a8e7eb5c5b83e5686d1e83b56f6aa9055..5cc357ac890db7d8ac55d121f1decdfb71686b90 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
@@ -3,7 +3,6 @@ package unipotsdam.gf.modules.assessment.controller.view;
import unipotsdam.gf.interfaces.IPeerAssessment;
import unipotsdam.gf.modules.assessment.controller.model.*;
import unipotsdam.gf.modules.assessment.controller.service.PeerAssessment;
-import unipotsdam.gf.modules.assessment.controller.service.PeerAssessmentDummy;
import javax.ws.rs.*;
import javax.ws.rs.core.MediaType;
@@ -12,14 +11,14 @@ import java.util.List;
@Path("/assessments")
public class QuizView implements IPeerAssessment {
- private static IPeerAssessment peer = new PeerAssessment(); //TestSubject
- //private static IPeerAssessment peer = new PeerAssessment(); //correct DB-conn and stuff
+ //private static IPeerAssessment peer = new PeerAssessmentDummy(); //TestSubject
+ private static IPeerAssessment peer = new PeerAssessment(); //correct DB-conn and stuff
@GET
@Produces(MediaType.APPLICATION_JSON)
- @Path("/project/{projectId}/quiz/{quizId}")
+ @Path("/project/{projectId}/quiz/{quizId}/author/{author}")
@Override
- public Quiz getQuiz(@PathParam("projectId") String projectId, @PathParam("quizId") String quizId) {
- return peer.getQuiz(projectId, quizId);
+ public Quiz getQuiz(@PathParam("projectId") String projectId, @PathParam("quizId") String quizId, @PathParam("author") String author) {
+ return peer.getQuiz(projectId, quizId, author);
} ///////////////////////////////funktioniert wie geplant//////////////////////////////////
@GET
@@ -29,6 +28,7 @@ public class QuizView implements IPeerAssessment {
public ArrayList<Quiz> getQuiz(@PathParam("projectId") String projectId) {
return peer.getQuiz(projectId);
}
+ //////////////////////////////////////////funktioniert///////////////////////////////////////
@POST
@Consumes(MediaType.APPLICATION_JSON)
@@ -46,6 +46,7 @@ public class QuizView implements IPeerAssessment {
public void deleteQuiz(@PathParam("quizId") String quizId) {
peer.deleteQuiz(quizId);
}
+ ////////////////////////////funktioniert////////////////////////////////////////////////////////
@POST
@Produces(MediaType.TEXT_PLAIN)
@@ -79,7 +80,7 @@ public class QuizView implements IPeerAssessment {
public void createQuiz(StudentAndQuiz studentAndQuiz) {
peer.createQuiz(studentAndQuiz);
}
- ////////////////////////////////todo: sollte das nächste Element sein, was ich baue////////
+ ////////////////////////////////funktioniert///////////////////////////////////////////
@POST
@Consumes(MediaType.APPLICATION_JSON)
@@ -95,9 +96,9 @@ public class QuizView implements IPeerAssessment {
@Produces(MediaType.APPLICATION_JSON)
@Path("/mean/project/{projectId}")
@Override
- public int meanOfAssessement(@PathParam("projectId") String ProjectId) {
+ public int meanOfAssessment(@PathParam("projectId") String ProjectId) {
- return peer.meanOfAssessement(ProjectId);
+ return peer.meanOfAssessment(ProjectId);
} ///////////////////////////////return 0//////////////////////////////////
@GET
diff --git a/gemeinsamforschen/src/main/webapp/assets/js/Quiz.js b/gemeinsamforschen/src/main/webapp/assets/js/Quiz.js
index 13320da654651883cce8ee026b9f221beeb57ebb..f61d898064472fb3da03c36308100e3db5fd9389 100644
--- a/gemeinsamforschen/src/main/webapp/assets/js/Quiz.js
+++ b/gemeinsamforschen/src/main/webapp/assets/js/Quiz.js
@@ -2,6 +2,7 @@ $(document).ready(function(){
var projectId = document.getElementById('projectId').innerText.trim();
$.ajax({
url: '../rest/assessments/project/'+projectId+'/quiz/',
+ projectId: projectId,
type: 'GET',
success: function (data) {
var table = document.getElementById('myQuizzes');
@@ -11,7 +12,10 @@ $(document).ready(function(){
var trQuestion = document.createElement('TR');
trQuestion.className="pageChanger";
trQuestion.innerHTML = '<td colspan="' + colspan + '"><h3>' +
- '<a href="viewQuiz.jsp?token='+getUserTokenFromUrl()+'&quizId='+ encodeURIComponent(data[quiz].question) + '"</a>' +
+ '<a href="viewQuiz.jsp' +
+ '?token='+getUserTokenFromUrl()+
+ '&projectId='+projectId+
+ '&quizId='+ encodeURIComponent(data[quiz].question)+'"</a>' +
data[quiz].question+'</h3></td>';
table.appendChild(trQuestion);
}
diff --git a/gemeinsamforschen/src/main/webapp/assets/js/createQuiz.js b/gemeinsamforschen/src/main/webapp/assets/js/createQuiz.js
index e845ceabfa8ab67be8b3900ac2d226451549fe52..79483cfe6bae660a1bf0ffe977e8a6e528da162e 100644
--- a/gemeinsamforschen/src/main/webapp/assets/js/createQuiz.js
+++ b/gemeinsamforschen/src/main/webapp/assets/js/createQuiz.js
@@ -1,11 +1,64 @@
$(document).ready(function () {
+ $('#addCorrectAnswer').on('click', function(){
+ var divCorrectAnswer = document.getElementById('correctAnswers');
+ var i = divCorrectAnswer.children.length;
+ var inputCorrectAnswer = document.createElement('INPUT');
+ inputCorrectAnswer.id='correctAnswer'+i;
+ divCorrectAnswer.appendChild(inputCorrectAnswer);
+ });
+
+ $('#addIncorrectAnswer').on('click', function(){
+ var divIncorrectAnswer = document.getElementById('incorrectAnswers');
+ var i = divIncorrectAnswer.children.length;
+ var inputIncorrectAnswer = document.createElement('INPUT');
+ inputIncorrectAnswer.id='incorrectAnswer'+i;
+ divIncorrectAnswer.appendChild(inputIncorrectAnswer);
+ });
+
+ $('#deleteCorrectAnswer').on('click', function(){
+ var divCorrectAnswer = document.getElementById('correctAnswers');
+ divCorrectAnswer.removeChild(divCorrectAnswer.lastChild);
+ });
+
+ $('#deleteIncorrectAnswer').on('click', function(){
+ var divIncorrectAnswer = document.getElementById('incorrectAnswers');
+ divIncorrectAnswer.removeChild(divIncorrectAnswer.lastChild);
+ });
+
$("#save").on('click', function () {
+ var correctAnswers= [];
+ var incorrectAnswers= [];
+ var shuttleList = document.getElementById('correctAnswers');
+ for (var i=0; i<shuttleList.children.length; i++)
+ {
+ correctAnswers.push(shuttleList.children[i].value.trim())
+ }
+ shuttleList = document.getElementById('incorrectAnswers');
+ for (i=0; i<shuttleList.children.length; i++)
+ {
+ incorrectAnswers.push(shuttleList.children[i].value.trim())
+ }
var quiz = {
- question: 'who am I',//todo: naja halt Quizskelett finden, erstellen und so URL encoden
- answer: ''
+ question: $('#question').val().trim(),
+ type: 'mc',
+ correctAnswers: correctAnswers,
+ incorrectAnswers: incorrectAnswers
+ };
+ var studentIdentifier = {
+ studentId: $('#user').html().trim(),
+ projectId: $('#projectId').html().trim()
};
+ var data = JSON.stringify({
+ studentIdentifier: studentIdentifier,
+ quiz: quiz
+ });
$.ajax({
+ data: data,
url: '../rest/assessments/quiz',
+ headers: {
+ "Content-Type": "application/json",
+ "Cache-Control": "no-cache"
+ },
type: 'POST',
success: function(){
@@ -14,6 +67,6 @@ $(document).ready(function () {
}
});
- document.location = "Quiz.jsp?token=" + getUserTokenFromUrl();
+ //document.location = "Quiz.jsp?token=" + getUserTokenFromUrl();
});
});
diff --git a/gemeinsamforschen/src/main/webapp/assets/js/finalAssessment.js b/gemeinsamforschen/src/main/webapp/assets/js/finalAssessment.js
index 7cefb9d460fc4665b58ae33f96bed4267a86b0bb..be02fb1ef1b8b4285585a18908dcd0452a16540e 100644
--- a/gemeinsamforschen/src/main/webapp/assets/js/finalAssessment.js
+++ b/gemeinsamforschen/src/main/webapp/assets/js/finalAssessment.js
@@ -33,7 +33,7 @@ function assessPeer(){
},
data: JSON.stringify(dataP),
success: function(){
- location.href="takeQuiz.jsp?token="+getUserTokenFromUrl();
+ location.href="takeQuiz.jsp?token="+getUserTokenFromUrl()+"&projectId="+$('#projectId').html().trim();
},
error: function(a,b,c){
diff --git a/gemeinsamforschen/src/main/webapp/assets/js/overview-student.js b/gemeinsamforschen/src/main/webapp/assets/js/overview-student.js
index 2cf207efe43ac69de868491e3264e78c837b0e9c..898f3f5e00183d9549a84cb5c3028be9aa7f5bd6 100644
--- a/gemeinsamforschen/src/main/webapp/assets/js/overview-student.js
+++ b/gemeinsamforschen/src/main/webapp/assets/js/overview-student.js
@@ -1,6 +1,9 @@
$(document).ready(function(){
$('#project1Link').on('click', function(){
- location.href="project-student.jsp?token="+getUserTokenFromUrl();
+ location.href="project-student.jsp?token="+getUserTokenFromUrl()+'&projectId='+'gemeinsamForschen';
+ });
+ $('#project2Link').on('click', function(){
+ location.href="project-student.jsp?token="+getUserTokenFromUrl()+'&projectId='+'Kaleo';
});
$('#enrollProject').on('click', function(){
location.href="enrollProject.jsp?token="+getUserTokenFromUrl();
diff --git a/gemeinsamforschen/src/main/webapp/assets/js/takeQuiz.js b/gemeinsamforschen/src/main/webapp/assets/js/takeQuiz.js
index 69aa397b9211c8cbf41c8e85c825551bb46f9f4a..1a8afcfa36d89450466a323728f57dc7f0ffb973 100644
--- a/gemeinsamforschen/src/main/webapp/assets/js/takeQuiz.js
+++ b/gemeinsamforschen/src/main/webapp/assets/js/takeQuiz.js
@@ -69,7 +69,7 @@ $(document).ready(function () {
}
});
$("#submitQuiz").on("click", function () {
- document.location="rateContribution.jsp?token="+getUserTokenFromUrl();
+ document.location="rateContribution.jsp?token="+getUserTokenFromUrl()+'&projectId='+$('#projectId').html().trim();
});
});
diff --git a/gemeinsamforschen/src/main/webapp/assets/js/utility.js b/gemeinsamforschen/src/main/webapp/assets/js/utility.js
index bbbf0394ae1ca308e21b690477ddb39619fd9161..33be09a5afb07442f689e89f4ef61a8c09ebc698 100644
--- a/gemeinsamforschen/src/main/webapp/assets/js/utility.js
+++ b/gemeinsamforschen/src/main/webapp/assets/js/utility.js
@@ -1,3 +1,7 @@
+$(document).ready(function(){
+ $('#headLineProject').html($('#projectId').html());
+});
+
function getUserTokenFromUrl() {
var parts = window.location.search.substr(1).split("&");
var $_GET = {};
diff --git a/gemeinsamforschen/src/main/webapp/assets/js/viewQuiz.js b/gemeinsamforschen/src/main/webapp/assets/js/viewQuiz.js
index f6f0748480d7d7b12ddbe85d66fa3ad76016c836..188e25781a3b642ab8a92582e96fe286b8f208a3 100644
--- a/gemeinsamforschen/src/main/webapp/assets/js/viewQuiz.js
+++ b/gemeinsamforschen/src/main/webapp/assets/js/viewQuiz.js
@@ -34,9 +34,10 @@ $(document).ready(function () {
$_GET[decodeURIComponent(temp[0])] = decodeURIComponent(temp[1]);
}
var quizId = $_GET['quizId'];
+ var author = $('#user').html().trim();
var projectId = document.getElementById('projectId').innerText.trim();
$.ajax({
- url: '../rest/assessments/project/'+projectId+'/quiz/'+quizId,
+ url: '../rest/assessments/project/'+projectId+'/quiz/'+quizId+'/author/'+author,
type: 'GET',
success: function (data) {
var table = document.getElementById('tableQuiz');
diff --git a/gemeinsamforschen/src/main/webapp/core/pages/gemeinsamForschen.tld b/gemeinsamforschen/src/main/webapp/core/pages/gemeinsamForschen.tld
index 3704c718e3338de67f5165d78f3d5785f983b11a..3b8f65da2d50696eaaa07ac4a4a5ed65aabcf8fd 100644
--- a/gemeinsamforschen/src/main/webapp/core/pages/gemeinsamForschen.tld
+++ b/gemeinsamforschen/src/main/webapp/core/pages/gemeinsamForschen.tld
@@ -15,4 +15,16 @@
<body-content>empty</body-content>
</tag>
+ <tag>
+ <name>headLine</name>
+ <tag-class>unipotsdam.gf.core.management.user.headLine</tag-class>
+ <body-content>empty</body-content>
+ </tag>
+
+ <tag>
+ <name>omniDependencies</name>
+ <tag-class>unipotsdam.gf.core.management.user.omniDependencies</tag-class>
+ <body-content>empty</body-content>
+ </tag>
+
</taglib>
\ No newline at end of file
diff --git a/gemeinsamforschen/src/main/webapp/pages/Quiz.jsp b/gemeinsamforschen/src/main/webapp/pages/Quiz.jsp
index 6b160e8df18ea9436dd080a338ee934c4f9c91e7..f5f04d45e484bec9d965916f9910f85a5fb176cf 100644
--- a/gemeinsamforschen/src/main/webapp/pages/Quiz.jsp
+++ b/gemeinsamforschen/src/main/webapp/pages/Quiz.jsp
@@ -1,45 +1,19 @@
-<%--
- 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" %>
+<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="headLine" %>
+<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="omniDependencies" %>
<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>
+ <omniDependencies:omniDependencies/>
<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>
+ <menu:menu/>
<div class="page-content-wrapper">
- <div class="container-fluid">
- <h1 id="projectId">gemeinsamForschen
- <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>
+ <headLine:headLine/>
<table class="table-striped">
<tbody id="myQuizzes">
diff --git a/gemeinsamforschen/src/main/webapp/pages/assessmentCalculator.jsp b/gemeinsamforschen/src/main/webapp/pages/assessmentCalculator.jsp
index e8cc29e1bd261c4649369c70ac15a3f6ed4c03d3..67b2861e38ad3e55fc6f0dd2db9acbab315608c6 100644
--- a/gemeinsamforschen/src/main/webapp/pages/assessmentCalculator.jsp
+++ b/gemeinsamforschen/src/main/webapp/pages/assessmentCalculator.jsp
@@ -1,18 +1,18 @@
<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
-<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="menu"%>
+<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="menu" %>
+<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="headLine" %>
+<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="omniDependencies" %>
<!DOCTYPE html>
<html lang="en">
<head>
- <meta charset="utf-8">
- <title>assessment calculator</title>
- <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.3.1/jquery.min.js"></script>
+ <omniDependencies:omniDependencies/>
<script src="../assets/js/assessmentCalculator.js"></script>
- <script src="../assets/js/utility.js"></script>
</head>
<body>
+<menu:menu/>
<button id="calculateNow">Post Performance</button>
<button id="giveItBack">Get TotalPerformance</button>
-<menu:menu></menu:menu>
+<headLine:headLine/>
</body>
</html>
\ No newline at end of file
diff --git a/gemeinsamforschen/src/main/webapp/pages/createQuiz.jsp b/gemeinsamforschen/src/main/webapp/pages/createQuiz.jsp
index 742ecfb02a64e3fb03bba5c3ecba5ec4be40ae7e..512844f6c308bac4903aaa02e3f92af58f0405a1 100644
--- a/gemeinsamforschen/src/main/webapp/pages/createQuiz.jsp
+++ b/gemeinsamforschen/src/main/webapp/pages/createQuiz.jsp
@@ -1,45 +1,30 @@
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="menu" %>
+<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="headLine" %>
+<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="omniDependencies" %>
<html>
<head>
- <meta 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>
+ <omniDependencies:omniDependencies/>
<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>
<div id="wrapper">
- <menu:menu></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>
+ <headLine:headLine/>
<div style="margin-left:50px;">
<div>
- <input placeholder="Ihre Frage"><!--todo: remember to cut out whitespace and signs (?.,;)-->
+ <label>Frage: <input placeholder="Ihre Frage" id="question"></label><!--todo: remember to cut out whitespace and signs (?.,;)-->
</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>
+ <div><label><input type="radio" name="type" checked="checked">multiple choice</label></div>
+ <div><label><input type="radio" name="type" disabled>Freitext</label></div>
+ <div><label><input type="radio" name="type" disabled>rhetorische Frage</label></div>
+ <div id="correctAnswers"><input placeholder="korrekte Antwort" id="correctAnswer"></div>
+ <button id="addCorrectAnswer"> + </button><button id="deleteCorrectAnswer"> - </button>
+ <div id="incorrectAnswers"><input placeholder="inkorrekte Antwort" id="incorrectAnswer"></div>
+ <button id="addIncorrectAnswer"> + </button><button id="deleteIncorrectAnswer"> - </button>
<button id="save">speichern</button>
</div>
</div>
diff --git a/gemeinsamforschen/src/main/webapp/pages/finalAssessments.jsp b/gemeinsamforschen/src/main/webapp/pages/finalAssessments.jsp
index 09ec382b8294edad32f29670b1ea81ec835e3ef8..2da5b4b53b7503cae373b9e70a96691a19c9ccf9 100644
--- a/gemeinsamforschen/src/main/webapp/pages/finalAssessments.jsp
+++ b/gemeinsamforschen/src/main/webapp/pages/finalAssessments.jsp
@@ -1,40 +1,22 @@
<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %>
<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="menu" %>
+<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="headLine" %>
+<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="omniDependencies" %>
<!DOCTYPE html>
<html>
<head>
- <meta 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>
- <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>
+ <omniDependencies:omniDependencies/>
<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>
<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>
+ <headLine:headLine/>
<div>
<table>
<tr>
diff --git a/gemeinsamforschen/src/main/webapp/pages/overview-docent.jsp b/gemeinsamforschen/src/main/webapp/pages/overview-docent.jsp
index a25d71d8d35bdaa5a3760e11eb5d7e23b3a044f0..7d41c3df0a9be59f029510b214077e6d57c59417 100644
--- a/gemeinsamforschen/src/main/webapp/pages/overview-docent.jsp
+++ b/gemeinsamforschen/src/main/webapp/pages/overview-docent.jsp
@@ -1,29 +1,19 @@
<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
-<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="menu" %>
+<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="menu" %>
+<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="headLine" %>
+<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="omniDependencies" %>
<!DOCTYPE html>
<html>
<head>
- <meta charset="utf-8">
- <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>
+ <omniDependencies:omniDependencies/>
<script src="../assets/js/overview-docent.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>
+ <menu:menu/>
<div class="page-content-wrapper">
<h1>Übersicht für Dozent1</h1>
@@ -36,7 +26,7 @@
<tr class="pageChanger">
<td>
<a id="project1Link">
- <h1>dummy Projekt1</h1>
+ <h1>gemeinsamForschen</h1>
</a>
</td>
</tr>
@@ -69,7 +59,7 @@
<tr class="pageChanger">
<td>
<a id="project2Link">
- <h1>dummy Projekt2</h1>
+ <h1>Kaleo</h1>
</a>
</td>
</tr>
diff --git a/gemeinsamforschen/src/main/webapp/pages/overview-student.jsp b/gemeinsamforschen/src/main/webapp/pages/overview-student.jsp
index ab21d52a2995b2e150d0883d456dd72fce018d53..8feef4d6d1bda9b41939b4bd5c2b386d070bbfec 100644
--- a/gemeinsamforschen/src/main/webapp/pages/overview-student.jsp
+++ b/gemeinsamforschen/src/main/webapp/pages/overview-student.jsp
@@ -1,42 +1,28 @@
<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %>
<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="menu" %>
+<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="headLine" %>
+<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="omniDependencies" %>
<!DOCTYPE html>
<html>
<head>
- <meta 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>
+ <omniDependencies:omniDependencies/>
<script src="../assets/js/overview-student.js"></script>
</head>
<body>
<div id="wrapper">
- <menu:menu></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>
+ <headLine:headLine/>
<div>
<table id="projects"> <!-- getElementById('projects').append um neue Projekte anzufügen -->
<tr class="pageChanger">
<td>
<a id="project1Link">
- <h1>dummy Projekt1</h1>
+ <h1>gemeinsamForschen</h1>
</a>
</td>
</tr>
@@ -69,8 +55,8 @@
</tr>
<tr class="pageChanger">
<td>
- <a href="project-student.jsp">
- <h1>dummy Projekt2</h1>
+ <a id="project2Link">
+ <h1>Kaleo</h1>
</a>
</td>
</tr>
diff --git a/gemeinsamforschen/src/main/webapp/pages/project-docent.jsp b/gemeinsamforschen/src/main/webapp/pages/project-docent.jsp
index e7323fe38f582b0f9fccaba76f4a000b6175f2bf..1ec616d09fc96d633e7e712d19b6b5595950d3c4 100644
--- a/gemeinsamforschen/src/main/webapp/pages/project-docent.jsp
+++ b/gemeinsamforschen/src/main/webapp/pages/project-docent.jsp
@@ -1,30 +1,20 @@
<%@ 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"%>
+<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="menu" %>
+<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="headLine" %>
+<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="omniDependencies" %>
<!DOCTYPE html>
<html>
<head>
- <meta charset="utf-8">
- <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>
+ <omniDependencies:omniDependencies/>
</head>
<body>
<div id="wrapper">
- <menu:menu></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>
diff --git a/gemeinsamforschen/src/main/webapp/pages/project-student.jsp b/gemeinsamforschen/src/main/webapp/pages/project-student.jsp
index d67bfa0b603a4d3ab4a805976c19bc16b3c70bf6..55567371949904fc7116ef7cf01bab56f50def4a 100644
--- a/gemeinsamforschen/src/main/webapp/pages/project-student.jsp
+++ b/gemeinsamforschen/src/main/webapp/pages/project-student.jsp
@@ -1,7 +1,8 @@
-<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
+<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %>
<%--suppress XmlDuplicatedId --%>
-
-<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="menu"%>
+<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="menu" %>
+<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="headLine" %>
+<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="omniDependencies" %>
<!--todo: E-mail an Studenten als Notifikation für Phasenwechsel -->
@@ -11,54 +12,22 @@
<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">
- <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>
+ <omniDependencies:omniDependencies/>
<script src="../assets/js/project-student.js"></script>
- <script src="../assets/js/Sidebar-Menu.js"></script>
+ <link rel="stylesheet" href="../assets/css/Community-ChatComments.css">
+
</head>
<body>
<div id="wrapper">
- <menu:menu></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>
+ <headLine:headLine/>
<div>
<table>
<tr>
- <td id="yourContent">
+ <td id="yourContent">
<h1>Feedbackable Students</h1>
<!-- here will be all the content -->
<table id="myGroupMembers">
@@ -74,13 +43,15 @@
<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>
+ <label style="font-size:10px;"><i class="far fa-comments"
+ style="font-size:15px;"></i>feedback</label>
</a>
</li>
<li>
Blumen ins Hausaufgabenheft geklebt
<a class="annotationview" role="button">
- <label style="font-size:10px;"><i class="far fa-comments" style="font-size:15px;"></i>feedback</label>
+ <label style="font-size:10px;"><i class="far fa-comments"
+ style="font-size:15px;"></i>feedback</label>
</a>
</li>
</a>
@@ -97,19 +68,22 @@
<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>
+ <label style="font-size:10px;"><i class="far fa-comments"
+ style="font-size:15px;"></i>feedback</label>
</a>
</li>
<li>
Literaturverzeichnis hochgeladen
<a class="annotationview" role="button">
- <label style="font-size:10px;"><i class="far fa-comments" style="font-size:15px;"></i>feedback</label>
+ <label style="font-size:10px;"><i class="far fa-comments"
+ style="font-size:15px;"></i>feedback</label>
</a>
</li>
<li>
Die armen Vegetarier
<a class="annotationview" role="button">
- <label style="font-size:10px;"><i class="far fa-comments" style="font-size:15px;"></i>feedback</label>
+ <label style="font-size:10px;"><i class="far fa-comments"
+ style="font-size:15px;"></i>feedback</label>
</a>
</li>
</ul>
@@ -125,7 +99,8 @@
<li>
"Viva la Floristika" - Titel hochgeladen
<a class="annotationview" role="button">
- <label style="font-size:10px;"><i class="far fa-comments" style="font-size:15px;"></i>feedback</label>
+ <label style="font-size:10px;"><i class="far fa-comments"
+ style="font-size:15px;"></i>feedback</label>
</a>
</li>
</ul>
@@ -143,7 +118,7 @@
</script>
</td>
- <td id="chat">
+ <td id="chat">
<div class="card">
<div class="card-header">
<h6 class="mb-0">Gruppen+Projekt Chat</h6>
diff --git a/gemeinsamforschen/src/main/webapp/pages/rateContribution.jsp b/gemeinsamforschen/src/main/webapp/pages/rateContribution.jsp
index 1cbd97668612b785995299c089e0dc8313a71732..e6898e77c5a1a3b2ef51c8c25c0e691dc0804773 100644
--- a/gemeinsamforschen/src/main/webapp/pages/rateContribution.jsp
+++ b/gemeinsamforschen/src/main/webapp/pages/rateContribution.jsp
@@ -1,42 +1,23 @@
<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %>
<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="menu" %>
+<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="headLine" %>
+<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="omniDependencies" %>
<!DOCTYPE html>
<html>
<head>
- <meta charset="utf-8">
- <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>
+ <omniDependencies:omniDependencies/>
<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>
+ <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>
+ <headLine:headLine/>
<div>
<table>
<tr>
diff --git a/gemeinsamforschen/src/main/webapp/pages/takeQuiz.jsp b/gemeinsamforschen/src/main/webapp/pages/takeQuiz.jsp
index 6d187767ff4c16c264721960f36e8bd3959d6265..4ea6f940f86c6e79ca065d8c95b166af70965480 100644
--- a/gemeinsamforschen/src/main/webapp/pages/takeQuiz.jsp
+++ b/gemeinsamforschen/src/main/webapp/pages/takeQuiz.jsp
@@ -1,38 +1,21 @@
<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
-<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="menu"%>
+<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="menu" %>
+<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="headLine" %>
+<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="omniDependencies" %>
<!DOCTYPE html>
<html>
<head>
- <meta charset="utf-8">
- <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>
+ <omniDependencies:omniDependencies/>
<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">
- <link rel="stylesheet" href="../assets/css/Sidebar-Menu.css">
+
</head>
<body>
<div id="wrapper">
- <menu:menu></menu:menu>
+ <menu:menu/>
<div class="page-content-wrapper">
- <div class="container-fluid">
- <h1 id="projectId">gemeinsamForschen
- <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>
+ <headLine:headLine/>
<div>
<table>
<tr>
diff --git a/gemeinsamforschen/src/main/webapp/pages/viewQuiz.jsp b/gemeinsamforschen/src/main/webapp/pages/viewQuiz.jsp
index 9c378feb1d69a1d0a78a2752c456188a451e3c4b..e105590e4a126bb3c2c390e9c9db96ff145dee07 100644
--- a/gemeinsamforschen/src/main/webapp/pages/viewQuiz.jsp
+++ b/gemeinsamforschen/src/main/webapp/pages/viewQuiz.jsp
@@ -1,41 +1,22 @@
<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
-<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="menu"%>
-<!DOCTYPE html>
+<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="menu" %>
+<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="headLine" %>
+<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="omniDependencies" %><!DOCTYPE html>
<html>
<head>
- <meta charset="utf-8">
- <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/utility.js"></script>
+ <omniDependencies:omniDependencies/>
<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>
+ <menu:menu/>
<div class="page-content-wrapper">
- <div class="container-fluid">
- <h1 id="projectId">gemeinsamForschen
- <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>
+ <headLine:headLine/>
<div>
<table>
<tr>