diff --git a/gemeinsamforschen/src/main/java/unipotsdam/gf/core/management/ManagementImpl.java b/gemeinsamforschen/src/main/java/unipotsdam/gf/core/management/ManagementImpl.java
index 8d98b2c0dd607ff3b33a62ec367255863a030214..b29ba4456b6b8d64ea374fef9202ffccf98ca180 100644
--- a/gemeinsamforschen/src/main/java/unipotsdam/gf/core/management/ManagementImpl.java
+++ b/gemeinsamforschen/src/main/java/unipotsdam/gf/core/management/ManagementImpl.java
@@ -203,15 +203,15 @@ public class ManagementImpl implements Management {
public Quiz getQuizByProjectGroupId(String projectId, String quizId){
MysqlConnect connect = new MysqlConnect();
connect.connect();
- String mysqlRequest = "SELECT * FROM quiz where projectId=" + projectId + " , question="+quizId;
+ String mysqlRequest = "SELECT * FROM quiz where projectId=? AND question=?";
VereinfachtesResultSet vereinfachtesResultSet =
- connect.issueSelectStatement(mysqlRequest, "");
+ connect.issueSelectStatement(mysqlRequest, projectId,quizId);
boolean next = vereinfachtesResultSet.next();
String question = "";
ArrayList<String> correctAnswers = new ArrayList<String>();
ArrayList<String> incorrectAnswers = new ArrayList<String>();
- String answer = "";
- Boolean correct = false;
+ String answer;
+ Boolean correct;
String mcType = "";
while (next) {
mcType = vereinfachtesResultSet.getString("mcType");
@@ -230,6 +230,49 @@ public class ManagementImpl implements Management {
return quiz;
}
+ public ArrayList<Quiz> getQuizByProjectId(String projectId) {
+ MysqlConnect connect = new MysqlConnect();
+ ArrayList<Quiz> result= new ArrayList<Quiz>();
+ connect.connect();
+ String mysqlRequest = "SELECT * FROM quiz where projectId= ?";
+ VereinfachtesResultSet vereinfachtesResultSet =
+ connect.issueSelectStatement(mysqlRequest, projectId);
+ boolean next = vereinfachtesResultSet.next();
+ String question = "";
+ ArrayList<String> correctAnswers = new ArrayList<String>();
+ ArrayList<String> incorrectAnswers = new ArrayList<String>();
+ String answer;
+ String oldQuestion="";
+ Boolean correct;
+ String mcType = "";
+ while (next) {
+ mcType = vereinfachtesResultSet.getString("mcType");
+ question = vereinfachtesResultSet.getString("question");
+ answer = vereinfachtesResultSet.getString("answer");
+ correct = vereinfachtesResultSet.getBoolean("correct");
+ if (oldQuestion.equals(question)){
+ if (correct){
+ correctAnswers.add(answer);
+ }else{
+ incorrectAnswers.add(answer);
+ }
+ }else{
+ result.add(new Quiz(mcType,question, correctAnswers, incorrectAnswers));
+ correctAnswers.clear();
+ incorrectAnswers.clear();
+ if (correct){
+ correctAnswers.add(answer);
+ }else{
+ incorrectAnswers.add(answer);
+ }
+
+ }
+ oldQuestion = question;
+ next = vereinfachtesResultSet.next();
+ }
+ return result;
+ }
+
private User getUserByField(String field, String value) {
MysqlConnect connect = new MysqlConnect();
connect.connect();
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 9ab276c63b7e61ed7d1fbd121717f3ab1b8f8232..5c88e90d410176ba9843511e65a349335c31803b 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
@@ -22,7 +22,7 @@ public class PeerAssessment implements IPeerAssessment {
@Override //returns all quizzes in the course
public ArrayList<Quiz> getQuiz(String projectId) {
- return null;
+ return new ManagementImpl().getQuizByProjectId(projectId);
}
@Override
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 4ee52595c40fdc7cc9163884de28199e63f1456e..9c542dda5b56ab29426f5a90a2af58937feef68a 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
@@ -12,7 +12,7 @@ import java.util.List;
@Path("/assessments")
public class QuizView implements IPeerAssessment {
- private static IPeerAssessment peer = new PeerAssessmentDummy(); //TestSubject
+ private static IPeerAssessment peer = new PeerAssessment(); //TestSubject
//private static IPeerAssessment peer = new PeerAssessment(); //correct DB-conn and stuff
@GET
@Produces(MediaType.APPLICATION_JSON)
@@ -60,7 +60,7 @@ public class QuizView implements IPeerAssessment {
public Assessment getAssessmentDataFromDB(@PathParam("projectId") String projectId,@PathParam("studentId") String studentId){
StudentIdentifier student = new StudentIdentifier(projectId, studentId);
return getAssessmentDataFromDB(student);
- } ///////////////////////////////funktioniert wie geplant//////////////////////////////////
+ } //////////dummy//////////////funktioniert wie geplant//////////////////////////////////
@POST
@@ -71,6 +71,7 @@ public class QuizView implements IPeerAssessment {
public void createQuiz(StudentAndQuiz studentAndQuiz) {
peer.createQuiz(studentAndQuiz);
}
+ ////////////////////////////////todo: sollte das nächste Element sein, was ich baue////////
@POST
@Consumes(MediaType.APPLICATION_JSON)
@@ -80,6 +81,7 @@ public class QuizView implements IPeerAssessment {
public List<Grading> calculateAssessment(ArrayList<Performance> totalPerformance) {
return peer.calculateAssessment(totalPerformance);
}
+ ///////////////dummy/////////funktioniert glaube ich!?////////////////////////////////////////
@GET
@Produces(MediaType.APPLICATION_JSON)
@@ -96,12 +98,12 @@ public class QuizView implements IPeerAssessment {
public ArrayList<Performance> getTotalAssessment(@PathParam("projectId") String ProjectId,@PathParam("student") String student){
StudentIdentifier studentIdentifier = new StudentIdentifier(ProjectId, student);
return getTotalAssessment(studentIdentifier);
- } ///////////////////////////////funktioniert wie geplant//////////////////////////////////
+ } //////////dummy/////////////funktioniert wie geplant//////////////////////////////////
@Override
public ArrayList<Performance> getTotalAssessment(StudentIdentifier studentIdentifier) {
return peer.getTotalAssessment(studentIdentifier);
- } ///////////////////////////////funktioniert wie geplant//////////////////////////////////
+ } /////////dummy/////////////funktioniert wie geplant//////////////////////////////////
@GET
@@ -116,6 +118,6 @@ public class QuizView implements IPeerAssessment {
result.add(pf);
result.add(pf2);
return result;
- } ///////////////////////////////returns what i expect it to return!!!!!//////////////////////////////////
+ } /////////dummy////////////returns what i expect it to return!!!!!//////////////////////////////////
}
diff --git a/gemeinsamforschen/src/main/webapp/assets/js/Quiz.js b/gemeinsamforschen/src/main/webapp/assets/js/Quiz.js
index afd43343d62eb5b43aa235ceb3c94683ede88baf..c5053ab286b4963e634436e3293f6414a6ca5b15 100644
--- a/gemeinsamforschen/src/main/webapp/assets/js/Quiz.js
+++ b/gemeinsamforschen/src/main/webapp/assets/js/Quiz.js
@@ -1,6 +1,7 @@
$(document).ready(function(){
+ var projectId = document.getElementById('projectId').innerText.trim();
$.ajax({
- url: '../rest/assessments/project/1/quiz/',
+ url: '../rest/assessments/project/'+projectId+'/quiz/',
type: 'GET',
success: function (data) {
var table = document.getElementById('myQuizzes');
diff --git a/gemeinsamforschen/src/main/webapp/assets/js/createQuiz.js b/gemeinsamforschen/src/main/webapp/assets/js/createQuiz.js
index 764a7a90dfd06ce45531d359c31d592b3a39c0f7..5da5a5f038ea60d7bfc7f09f28f51d49116133ff 100644
--- a/gemeinsamforschen/src/main/webapp/assets/js/createQuiz.js
+++ b/gemeinsamforschen/src/main/webapp/assets/js/createQuiz.js
@@ -1,5 +1,5 @@
$(document).ready(function () {
- $("#save").on('click', function () {
+ $("#save").on('click', function () {//todo: remember to cut out whitespace and signs (?.,;)
document.location = "Quiz.jsp?token=" + getUserTokenFromUrl();
});
});
diff --git a/gemeinsamforschen/src/main/webapp/assets/js/takeQuiz.js b/gemeinsamforschen/src/main/webapp/assets/js/takeQuiz.js
index 9bc226153048dc0874087970dddf8a9965b3295e..69aa397b9211c8cbf41c8e85c825551bb46f9f4a 100644
--- a/gemeinsamforschen/src/main/webapp/assets/js/takeQuiz.js
+++ b/gemeinsamforschen/src/main/webapp/assets/js/takeQuiz.js
@@ -28,8 +28,9 @@ $(document).ready(function () {
return 'CORRECT';
};
+ var projectId = document.getElementById('projectId').innerText.trim();
$.ajax({
- url: '../rest/assessments/project/1/quiz/',
+ url: '../rest/assessments/project/'+projectId+'/quiz/',
type: 'GET',
success: function (data) {
var table = document.getElementById('tableQuiz');
diff --git a/gemeinsamforschen/src/main/webapp/assets/js/viewQuiz.js b/gemeinsamforschen/src/main/webapp/assets/js/viewQuiz.js
index 362479e7371bfb8ea4637c238ec8dc0c874b3543..06a59b90038c99d701debeb974dea80724ee8637 100644
--- a/gemeinsamforschen/src/main/webapp/assets/js/viewQuiz.js
+++ b/gemeinsamforschen/src/main/webapp/assets/js/viewQuiz.js
@@ -34,9 +34,9 @@ $(document).ready(function () {
$_GET[decodeURIComponent(temp[0])] = decodeURIComponent(temp[1]);
}
var quizId = $_GET['quizId'];
-
+ var projectId = document.getElementById('projectId').innerText.trim();
$.ajax({
- url: '../rest/assessments/project/1/quiz/'+quizId,
+ url: '../rest/assessments/project/'+projectId+'/quiz/'+quizId,
type: 'GET',
success: function (data) {
var table = document.getElementById('tableQuiz');
diff --git a/gemeinsamforschen/src/main/webapp/pages/Quiz.jsp b/gemeinsamforschen/src/main/webapp/pages/Quiz.jsp
index 276a9e024dcc1658c5290b3774cde54dd4029047..6b160e8df18ea9436dd080a338ee934c4f9c91e7 100644
--- a/gemeinsamforschen/src/main/webapp/pages/Quiz.jsp
+++ b/gemeinsamforschen/src/main/webapp/pages/Quiz.jsp
@@ -30,7 +30,7 @@
<menu:menu></menu:menu>
<div class="page-content-wrapper">
<div class="container-fluid">
- <h1 id="projectId">project1
+ <h1 id="projectId">gemeinsamForschen
<a href="#">
<span class="glyphicon glyphicon-envelope"
style="font-size:27px;margin-top:-17px;margin-left:600px;"></span>
diff --git a/gemeinsamforschen/src/main/webapp/pages/createQuiz.jsp b/gemeinsamforschen/src/main/webapp/pages/createQuiz.jsp
index ad122bc926c195526ea109c12152f1a24209e498..742ecfb02a64e3fb03bba5c3ecba5ec4be40ae7e 100644
--- a/gemeinsamforschen/src/main/webapp/pages/createQuiz.jsp
+++ b/gemeinsamforschen/src/main/webapp/pages/createQuiz.jsp
@@ -33,7 +33,7 @@
</div>
<div style="margin-left:50px;">
<div>
- <input placeholder="Ihre Frage">
+ <input placeholder="Ihre Frage"><!--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>
diff --git a/gemeinsamforschen/src/main/webapp/pages/takeQuiz.jsp b/gemeinsamforschen/src/main/webapp/pages/takeQuiz.jsp
index 9ddb24242d7dbd999ff642237437caf061612c30..6d187767ff4c16c264721960f36e8bd3959d6265 100644
--- a/gemeinsamforschen/src/main/webapp/pages/takeQuiz.jsp
+++ b/gemeinsamforschen/src/main/webapp/pages/takeQuiz.jsp
@@ -24,7 +24,7 @@
<menu:menu></menu:menu>
<div class="page-content-wrapper">
<div class="container-fluid">
- <h1 id="projectId">project1
+ <h1 id="projectId">gemeinsamForschen
<a href="#">
<span class="glyphicon glyphicon-envelope"
style="font-size:27px;margin-top:-17px;margin-left:600px;"></span>
@@ -37,7 +37,7 @@
<table>
<tr>
<td id="yourContent">
- <h1>Quiz for project1 </h1>
+ <h1>Quiz for gemeinsamForschen </h1>
<!-- here will be all the content -->
diff --git a/gemeinsamforschen/src/main/webapp/pages/viewQuiz.jsp b/gemeinsamforschen/src/main/webapp/pages/viewQuiz.jsp
index a484d9381f9a963ff485ca311cae45714c357b14..800ad4dc68b6f7c2a785be13e6294a66baf4198a 100644
--- a/gemeinsamforschen/src/main/webapp/pages/viewQuiz.jsp
+++ b/gemeinsamforschen/src/main/webapp/pages/viewQuiz.jsp
@@ -25,7 +25,7 @@
<menu:menu></menu:menu>
<div class="page-content-wrapper">
<div class="container-fluid">
- <h1 id="projectId">project1
+ <h1 id="projectId">gemeinsamForschen
<a href="#">
<span class="glyphicon glyphicon-envelope"
style="font-size:27px;margin-top:-17px;margin-left:600px;"></span>