diff --git a/gemeinsamforschen/src/main/java/unipotsdam/gf/config/GFApplicationBinder.java b/gemeinsamforschen/src/main/java/unipotsdam/gf/config/GFApplicationBinder.java
index 46622bb57ede5b8006c17ce1b5ef304e49576ecf..0d796f05b2e90acf6b5bac5f4108710fcd30d5ec 100644
--- a/gemeinsamforschen/src/main/java/unipotsdam/gf/config/GFApplicationBinder.java
+++ b/gemeinsamforschen/src/main/java/unipotsdam/gf/config/GFApplicationBinder.java
@@ -9,8 +9,6 @@ import unipotsdam.gf.modules.communication.service.CommunicationDummyService;
import unipotsdam.gf.modules.group.DummyGroupfinding;
import unipotsdam.gf.modules.group.DummyProjectCreationService;
import unipotsdam.gf.modules.group.GroupDAO;
-import unipotsdam.gf.modules.group.GroupfindingImpl;
-import unipotsdam.gf.modules.journal.service.IJournalImpl;
import unipotsdam.gf.modules.project.Management;
import unipotsdam.gf.modules.project.ManagementImpl;
import unipotsdam.gf.modules.project.ProjectConfigurationDAO;
@@ -31,20 +29,17 @@ import unipotsdam.gf.session.GFContexts;
public class GFApplicationBinder extends AbstractBinder {
- /**
- * TODO replace DummyImplementation
- */
+
@Override
protected void configure() {
bind(CommunicationDummyService.class).to(ICommunication.class);
bind(ManagementImpl.class).to(Management.class);
+
bind(PeerAssessment.class).to(IPeerAssessment.class);
bind(PhasesImpl.class).to(IPhases.class);
bind(ManagementImpl.class).to(Management.class);
bind(DummyResearchReportManagement.class).to(ResearchReportManagement.class);
bind(DummyGroupfinding.class).to(IGroupFinding.class);
- bind(IJournalImpl.class).to(IJournal.class);
- bind(GroupfindingImpl.class).to(IGroupFinding.class);
bind(AssessmentDBCommunication.class).to(AssessmentDBCommunication.class);
bind(GFContexts.class).to(GFContexts.class);
bind(ProjectCreationProcess.class).to(ProjectCreationProcess.class);
diff --git a/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/assessment/controller/service/AssessmentDBCommunication.java b/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/assessment/controller/service/AssessmentDBCommunication.java
index 34f7f2bfd6d1b0da4ab98c87860c997e91a1d2e2..33e4a18605e586d52958729273aaf153da1a305a 100644
--- a/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/assessment/controller/service/AssessmentDBCommunication.java
+++ b/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/assessment/controller/service/AssessmentDBCommunication.java
@@ -42,7 +42,7 @@ public class AssessmentDBCommunication {
ArrayList<Map<String, Double>> result = new ArrayList<>();
connect.connect();
- String mysqlRequest = "SELECT * FROM `workrating` WHERE `projectName`=? AND `userName`=?";
+ String mysqlRequest = "SELECT * FROM `workrating` WHERE `projectName`=? AND `userEmail`=?";
VereinfachtesResultSet vereinfachtesResultSet =
connect.issueSelectStatement(mysqlRequest, student.getProjectName(), student.getUserEmail());
boolean next = vereinfachtesResultSet.next();
@@ -60,7 +60,7 @@ public class AssessmentDBCommunication {
Boolean getWorkRating(StudentIdentifier student, String fromStudent) {
connect.connect();
- String mysqlRequest = "SELECT * FROM `workrating` WHERE `projectName`=? AND `userName`=? AND `fromPeer`=?";
+ String mysqlRequest = "SELECT * FROM `workrating` WHERE `projectName`=? AND `userEmail`=? AND `fromPeer`=?";
VereinfachtesResultSet vereinfachtesResultSet =
connect.issueSelectStatement(mysqlRequest, student.getProjectName(), student.getUserEmail(),
fromStudent);
@@ -74,32 +74,21 @@ public class AssessmentDBCommunication {
VereinfachtesResultSet vereinfachtesResultSet = connect.issueSelectStatement(mysqlRequest, projectID);
boolean next = vereinfachtesResultSet.next();
while (next) {
- result.add(vereinfachtesResultSet.getString("userID"));
+ result.add(vereinfachtesResultSet.getString("userEmail"));
next = vereinfachtesResultSet.next();
}
return result;
}
- Integer getGroupByStudent(StudentIdentifier student) {
- Integer result;
- connect.connect();
- String mysqlRequest = "SELECT groupId FROM `groupuser` WHERE `projectName`=? AND `userName`=?";
- VereinfachtesResultSet vereinfachtesResultSet =
- connect.issueSelectStatement(mysqlRequest, student.getProjectName(), student.getUserEmail());
- vereinfachtesResultSet.next();
- result = vereinfachtesResultSet.getInt("groupId");
- return result;
- }
-
- ArrayList<String> getStudentsByGroupAndProject(Integer groupId, String projectName) {
+ ArrayList<String> getStudentsByGroupAndProject(Integer groupId) {
ArrayList<String> result = new ArrayList<>();
connect.connect();
- String mysqlRequest = "SELECT * FROM `groupuser` WHERE `groupId`=? AND `projectName`=?";
+ String mysqlRequest = "SELECT * FROM `groupuser` WHERE `groupId`=?";
VereinfachtesResultSet vereinfachtesResultSet =
- connect.issueSelectStatement(mysqlRequest, groupId, projectName);
+ connect.issueSelectStatement(mysqlRequest, groupId);
Boolean next = vereinfachtesResultSet.next();
while (next) {
- result.add(vereinfachtesResultSet.getString("userName"));
+ result.add(vereinfachtesResultSet.getString("userEmail"));
next = vereinfachtesResultSet.next();
}
return result;
@@ -148,7 +137,7 @@ public class AssessmentDBCommunication {
ArrayList<Integer> getAnsweredQuizzes(StudentIdentifier student) {
ArrayList<Integer> result = new ArrayList<>();
connect.connect();
- String mysqlRequest = "SELECT * FROM `answeredquiz` WHERE `projectName`=? AND `userName`=?";
+ String mysqlRequest = "SELECT * FROM `answeredquiz` WHERE `projectName`=? AND `userEmail`=?";
VereinfachtesResultSet vereinfachtesResultSet =
connect.issueSelectStatement(mysqlRequest, student.getProjectName(), student.getUserEmail());
boolean next = vereinfachtesResultSet.next();
@@ -164,7 +153,7 @@ public class AssessmentDBCommunication {
connect.connect();
for (String question : questions.keySet()) {
String mysqlRequest =
- "INSERT INTO `answeredquiz`(`projectName`, `userName`, `question`, `correct`) VALUES (?,?,?,?)";
+ "INSERT INTO `answeredquiz`(`projectName`, `userEmail`, `question`, `correct`) VALUES (?,?,?,?)";
connect.issueInsertOrDeleteStatement(mysqlRequest, student.getProjectName(), student.getUserEmail(),
question, questions.get(question));
}
@@ -174,7 +163,7 @@ public class AssessmentDBCommunication {
void writeWorkRatingToDB(StudentIdentifier student, String fromStudent, Map<String, Integer> workRating) {
connect.connect();
String mysqlRequest =
- "INSERT INTO `workrating`(`projectName`, `userName`, `fromPeer`, " + "`responsibility`, " + "`partOfWork`, " + "`cooperation`, " + "`communication`, " + "`autonomous`" + ") VALUES (?,?,?,?,?,?,?,?)";
+ "INSERT INTO `workrating`(`projectName`, `userEmail`, `fromPeer`, " + "`responsibility`, " + "`partOfWork`, " + "`cooperation`, " + "`communication`, " + "`autonomous`" + ") VALUES (?,?,?,?,?,?,?,?)";
connect.issueInsertOrDeleteStatement(mysqlRequest, student.getProjectName(), student.getUserEmail(),
fromStudent, workRating.get("responsibility"), workRating.get("partOfWork"),
workRating.get("cooperation"), workRating.get("communication"), workRating.get("autonomous"));
@@ -184,7 +173,7 @@ public class AssessmentDBCommunication {
Integer getWhichGroupToRate(StudentIdentifier student) {
Integer result;
connect.connect();
- String mysqlRequest1 = "SELECT groupId FROM `groupuser` WHERE `projectName`=? AND `userName`=? ";
+ String mysqlRequest1 = "SELECT groupId FROM `groupuser` WHERE `projectName`=? AND `userEmail`=? ";
VereinfachtesResultSet vereinfachtesResultSet1 =
connect.issueSelectStatement(mysqlRequest1, student.getProjectName(), student.getUserEmail());
vereinfachtesResultSet1.next();
@@ -213,7 +202,7 @@ public class AssessmentDBCommunication {
void writeContributionRatingToDB(String groupId, String fromStudent, Map<String, Integer> contributionRating) {
connect.connect();
String mysqlRequest =
- "INSERT INTO `contributionrating`(" + "`groupId`, " + "`fromPeer`, " + "`dossier`, " + "`research`) " + "VALUES (?,?,?,?)";
+ "INSERT INTO `contributionrating`(`groupId`, `fromPeer`, `dossier`, `research`) VALUES (?,?,?,?)";
connect.issueInsertOrDeleteStatement(mysqlRequest, groupId, fromStudent, contributionRating.get("dossier"),
contributionRating.get("research"));
connect.close();
@@ -221,7 +210,7 @@ public class AssessmentDBCommunication {
void writeGradesToDB(Map<StudentIdentifier, Double> grade) {
connect.connect();
- String mysqlRequest = "INSERT INTO `grades`(`projectName`, `userName`, `grade`) VALUES (?,?,?)";
+ String mysqlRequest = "INSERT INTO `grades`(`projectName`, `userEmail`, `grade`) VALUES (?,?,?)";
for (StudentIdentifier student : grade.keySet()) {
connect.issueInsertOrDeleteStatement(mysqlRequest, student.getProjectName(), student.getUserEmail(),
grade.get(student));
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 2694566a047bfa634f1291a96376ebdbb91a3592..6bb99705b44519961e5ee0281451ecf59c3851e9 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
@@ -1,5 +1,6 @@
package unipotsdam.gf.modules.assessment.controller.service;
+import unipotsdam.gf.modules.group.GroupDAO;
import unipotsdam.gf.modules.project.Management;
import unipotsdam.gf.modules.project.Project;
import unipotsdam.gf.process.constraints.ConstraintsMessages;
@@ -26,6 +27,9 @@ public class PeerAssessment implements IPeerAssessment {
@Inject
private AssessmentDBCommunication assessmentDBCommunication;
+ @Inject
+ private GroupDAO groupDAO;
+
@Override
public void finalizeAssessment(String projectName){
cheatCheckerMethods method = assessmentDBCommunication.getAssessmentMethod(projectName);
@@ -70,8 +74,8 @@ public class PeerAssessment implements IPeerAssessment {
@Override
public String whatToRate(StudentIdentifier student) {
- Integer groupId = assessmentDBCommunication.getGroupByStudent(student);
- ArrayList<String> groupMembers = assessmentDBCommunication.getStudentsByGroupAndProject(groupId, student.getProjectName());
+ Integer groupId = groupDAO.getGroupByStudent(student);
+ ArrayList<String> groupMembers = assessmentDBCommunication.getStudentsByGroupAndProject(groupId);
for (String peer : groupMembers) {
if (!peer.equals(student.getUserEmail())) {
StudentIdentifier groupMember = new StudentIdentifier(student.getProjectName(), peer);
@@ -130,7 +134,7 @@ public class PeerAssessment implements IPeerAssessment {
Integer groupId;
Performance performance = new Performance();
StudentIdentifier userNameentifier = new StudentIdentifier(projectName, student);
- groupId = assessmentDBCommunication.getGroupByStudent(userNameentifier);
+ groupId = groupDAO.getGroupByStudent(userNameentifier);
//todo: answered quizzes vervöllstandigen
Integer numberOfQuizzes = assessmentDBCommunication.getQuizCount(projectName);
List<Integer> answeredQuizzes = assessmentDBCommunication.getAnsweredQuizzes(userNameentifier);
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 5c852a1bbbe16da0b8e66775ae3fce950a1f6565..72d727d13c97b71d5efeae2d2f80371311a2a5e4 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
@@ -23,7 +23,8 @@ import java.util.Map;
@Path("/assessments")
public class QuizView {
- private static IPeerAssessment peer = new PeerAssessment(); //correct DB-conn and stuff
+ @Inject
+ private IPeerAssessment peer; //correct DB-conn and stuff
@Inject
Management management;
diff --git a/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/group/GroupDAO.java b/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/group/GroupDAO.java
index 9551934150e392fdb8ffd801dd9328dc54edd3a0..bb08657163aab9a43067882b40791bb6de703403 100644
--- a/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/group/GroupDAO.java
+++ b/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/group/GroupDAO.java
@@ -21,6 +21,7 @@ import java.util.Objects;
@Singleton
public class GroupDAO {
+ @Inject
private MysqlConnect connect;
@Inject
@@ -28,28 +29,33 @@ public class GroupDAO {
this.connect = connect;
}
- public ArrayList<String> getStudentsInSameGroupAs(StudentIdentifier student) {
+ ArrayList<String> getStudentsInSameGroupAs(StudentIdentifier student) {
connect.connect();
ArrayList<String> result = new ArrayList<>();
- Integer groupId;
- String mysqlRequest1 = "SELECT groupId FROM `groupuser` WHERE `projectName`=? AND `userEmail`=?";
- VereinfachtesResultSet vereinfachtesResultSet1 =
- connect.issueSelectStatement(mysqlRequest1, student.getProjectName(), student.getUserEmail());
- vereinfachtesResultSet1.next();
- groupId = vereinfachtesResultSet1.getInt("groupId");
- String mysqlRequest2 = "SELECT * FROM `groupuser` WHERE `groupId`=?";
- VereinfachtesResultSet vereinfachtesResultSet2 = connect.issueSelectStatement(mysqlRequest2, groupId);
- boolean next2 = vereinfachtesResultSet2.next();
+ int groupId= getGroupByStudent(student);
+ String mysqlRequest = "SELECT * FROM `groupuser` WHERE `groupId`=?";
+ VereinfachtesResultSet vereinfachtesResultSet = connect.issueSelectStatement(mysqlRequest, groupId);
+ boolean next2 = vereinfachtesResultSet.next();
while (next2) {
- String peer = vereinfachtesResultSet2.getString("userName");
+ String peer = vereinfachtesResultSet.getString("userEmail");
if (!peer.equals(student.getUserEmail()))
result.add(peer);
- next2 = vereinfachtesResultSet2.next();
+ next2 = vereinfachtesResultSet.next();
}
connect.close();
return result;
}
+ public Integer getGroupByStudent(StudentIdentifier student) {
+ Integer result;
+ connect.connect();
+ String mysqlRequest = "SELECT groupId FROM `groupuser` gu JOIN groups g WHERE g.`projectName`=? AND gu.groupid=g.id AND gu.userEmail=? ";
+ VereinfachtesResultSet vereinfachtesResultSet =
+ connect.issueSelectStatement(mysqlRequest, student.getProjectName(), student.getUserEmail());
+ vereinfachtesResultSet.next();
+ result = vereinfachtesResultSet.getInt("groupId");
+ return result;
+ }
// refactor (you get the id as a return value when inserting into the db)
public void persist(Group group) {
diff --git a/gemeinsamforschen/src/main/webapp/annotation/js/unstructuredRest.js b/gemeinsamforschen/src/main/webapp/annotation/js/unstructuredRest.js
index b907df10aca325e5079dff71fd86d3fd03ec6c70..f3c37746cc684e31d7539d48ea217b9214aa79b8 100644
--- a/gemeinsamforschen/src/main/webapp/annotation/js/unstructuredRest.js
+++ b/gemeinsamforschen/src/main/webapp/annotation/js/unstructuredRest.js
@@ -5,8 +5,8 @@
* @param responseHandler The response handler
*/
function createFullSubmission(fullSubmissionPostRequest, responseHandler) {
- var url = "../rest/submissions/full";
- var json = JSON.stringify(fullSubmissionPostRequest);
+ let url = "../rest/submissions/full";
+ let json = JSON.stringify(fullSubmissionPostRequest);
$.ajax({
url: url,
type: "POST",
diff --git a/gemeinsamforschen/src/main/webapp/annotation/js/unstructuredUpload.js b/gemeinsamforschen/src/main/webapp/annotation/js/unstructuredUpload.js
index 36aa903bb826d376003ea24eb8a02bf4e9d1a1db..f85f6f746e5cd1f9d4b6103c61270203ff581432 100644
--- a/gemeinsamforschen/src/main/webapp/annotation/js/unstructuredUpload.js
+++ b/gemeinsamforschen/src/main/webapp/annotation/js/unstructuredUpload.js
@@ -11,10 +11,10 @@ $(document).ready(function () {
let text = $('#upload-textarea').val();
// build request
- var fullSubmissionPostRequest = {
+ let fullSubmissionPostRequest = {
user: user,
text: text,
- projectName: getQueryVariable("projectName")
+ projectName: $('#projectName').text().trim()
};
// save request in database
@@ -23,7 +23,7 @@ $(document).ready(function () {
$('#upload-textarea').val("");
// jump to next page
- location.href = "create-unstructured-annotation.jsp?projectName=" + getQueryVariable("projectName") + "&submissionId=" + response.id;
+ location.href = "create-unstructured-annotation.jsp?projectName=" + $('#projectName').text().trim() + "&submissionId=" + response.id;
});
}
});
diff --git a/gemeinsamforschen/src/main/webapp/annotation/upload-unstructured-dossier.jsp b/gemeinsamforschen/src/main/webapp/annotation/upload-unstructured-dossier.jsp
index 1ff748840a73c5c6ae742a638a200e8a1c3c8297..566f771f57719b149c6384e8a61fa7b34176f56d 100644
--- a/gemeinsamforschen/src/main/webapp/annotation/upload-unstructured-dossier.jsp
+++ b/gemeinsamforschen/src/main/webapp/annotation/upload-unstructured-dossier.jsp
@@ -2,6 +2,7 @@
<%@ taglib uri="../taglibs/gemeinsamForschen.tld" prefix="menu" %>
<%@ taglib uri="../taglibs/gemeinsamForschen.tld" prefix="headLine" %>
<%@ taglib uri="../taglibs/gemeinsamForschen.tld" prefix="omniDependencies" %>
+<%@ taglib uri="../taglibs/gemeinsamForschen.tld" prefix="footer" %>
<!DOCTYPE html>
@@ -27,37 +28,28 @@
<body>
<menu:menu hierarchy="1"/>
-<div id="wrapper">
- <div class="page-content-wrapper full-height">
- <div class="container-fluid full-height">
- <div class="container-fluid-content">
- <div class="flex">
- <headLine:headLine/>
- </div>
- <div class="content-mainpage">
- <form id="upload-textarea-form">
- <div class="form-group upload-text" id="documentText">
- <label for="upload-textarea">Texteingabe</label>
- <textarea class="upload-text-textarea form-control" placeholder="Text einfügen..."
- id="upload-textarea" name="uploadtextarea"></textarea>
- </div>
- </form>
-
- <div>
- <label for="file">Alternativ bitte Datei wählen</label>
- <input type="file" id="file" name="file">
- </div>
- <div class="document-text-buttons">
- <%--<button type="button" class="btn btn-secondary document-text-buttons-back" id="btnBack">Zurück
- </button>--%>
- <button type="button" class="btn btn-primary document-text-buttons-next" id="btnNext">Weiter
- </button>
- </div>
- </div>
- </div>
+<div class="col span_l_of_2"> <!-- col right-->
+ <headLine:headLine/>
+ <form id="upload-textarea-form">
+ <div class="form-group upload-text" id="documentText">
+ <label for="upload-textarea">Texteingabe</label>
+ <textarea class="upload-text-textarea form-control" placeholder="Text einfügen..."
+ id="upload-textarea" name="uploadtextarea"></textarea>
</div>
+ </form>
+
+ <div>
+ <label for="file">Alternativ bitte Datei wählen</label>
+ <input type="file" id="file" name="file">
+ </div>
+ <div class="document-text-buttons">
+ <%--<button type="button" class="btn btn-secondary document-text-buttons-back" id="btnBack">Zurück
+ </button>--%>
+ <button type="button" class="btn btn-primary document-text-buttons-next" id="btnNext">Weiter
+ </button>
</div>
</div>
+<footer:footer/>
</body>
</html>
diff --git a/gemeinsamforschen/src/main/webapp/assessment/assess-work.jsp b/gemeinsamforschen/src/main/webapp/assessment/assess-work.jsp
index 81fc73011447d186ae8fe34d379832d4d5bf16f5..6955e9df9b1e0de4eef58f923eb6740eb4faa540 100644
--- a/gemeinsamforschen/src/main/webapp/assessment/assess-work.jsp
+++ b/gemeinsamforschen/src/main/webapp/assessment/assess-work.jsp
@@ -22,7 +22,7 @@
<table>
<tr>
<td id="yourContent">
- <h1>Assessment for project1 </h1>
+ <h1>Assessment</h1>
<!-- Vorschläge für Bewertungen:
++Verantwortungsbewusstsein
@@ -50,299 +50,99 @@
</div>
<div class="carousel-inner" id="peerTable">
- <!--<div class="item active">
- <table class="table-striped peerStudent"
- style="width:70%;border:1px solid; margin:auto;" id="Student1">
- <tr>
- <td align="center">
- <img src="../assets/img/1.jpg" alt="student1"
- style="width:20%;">
- </td>
- </tr>
- <tr>
- <td align="center">
- <h3>Verantwortungsbewusstsein</h3>
- </td>
- </tr>
- <tr>
- <td align="center">
- <label>stark ausgeprägt<input type="radio" value="5"
- name="responsibilityStudent1"></label>
- <input type="radio" value="4" name="responsibilityStudent1">
- <input type="radio" value="3" name="responsibilityStudent1">
- <input type="radio" value="2" name="responsibilityStudent1">
- <label><input type="radio" value="1" name="responsibilityStudent1">
- ungenügend</label>
- </td>
- </tr>
- <tr>
- <td align="center">
- <h3>Anteil am Produkt</h3>
- </td>
- </tr>
- <tr>
- <td align="center">
- <label>großer Anteil<input type="radio" value="5"
- name="partOfWorkStudent1"></label>
- <input type="radio" value="4" name="partOfWorkStudent1">
- <input type="radio" value="3" name="partOfWorkStudent1">
- <input type="radio" value="2" name="partOfWorkStudent1">
- <label><input type="radio" value="1" name="partOfWorkStudent1">
- geringer Anteil</label>
- </td>
- </tr>
- <tr>
- <td align="center">
- <h3>Kooperationsbereitschaft</h3>
- </td>
- </tr>
- <tr>
- <td align="center">
- <label>sehr kooperativ<input type="radio" value="5" name="cooperationStudent1">
- </label>
- <input type="radio" value="4" name="cooperationStudent1">
- <input type="radio" value="3" name="cooperationStudent1">
- <input type="radio" value="2" name="cooperationStudent1">
- <label><input type="radio" value="1" name="cooperationStudent1">
- nicht kooperativ</label>
- </td>
- </tr>
- <tr>
- <td align="center">
- <h3>Disskusionsfähigkeit</h3>
- </td>
- </tr>
- <tr>
- <td align="center">
- <label>gut kommuniziert und Meinung vertreten<input type="radio" value="5" name="communicationStudent1">
- </label>
- <input type="radio" value="4" name="communicationStudent1">
- <input type="radio" value="3" name="communicationStudent1">
- <input type="radio" value="2" name="communicationStudent1">
- <label><input type="radio" value="1" name="communicationStudent1">
- keine Meinung und schlecht kommuniziert</label>
- </td>
- </tr>
- <tr>
- <td align="center">
- <h3>Selbstständigkeit</h3>
- </td>
- </tr>
- <tr>
- <td align="center">
- <label>selbstständig<input type="radio" value="5" name="autonomousStudent1">
- </label>
- <input type="radio" value="4" name="autonomousStudent1">
- <input type="radio" value="3" name="autonomousStudent1">
- <input type="radio" value="2" name="autonomousStudent1">
- <label><input type="radio" value="1" name="autonomousStudent1">
- abhängig</label>
- </td>
- </tr>
+ <script id="peerTemplate" type="text/x-jQuery-tmpl">
+ {{if first}}
+ <div class="item active">
+ {{else}}
+ <div class="item">
+ {{/if}}
+ <table class="table-striped peerStudent" id="${peerId}">
+ <tr>
+ <td align="center">
+ <img src="../libs/img/noImg.png" alt="${peerId}" style="width:20%;">
+ </td>
+ </tr>
+ <tr>
+ <td align="center">
+ <h3>Verantwortungsbewusstsein</h3>
+ </td>
+ </tr>
+ <tr>
+ <td align="center">
+ <label>stark ausgeprägt<input type="radio" value="5" name="responsibility${peerId}"></label>
+ <input type="radio" value="4" name="responsibility${peerId}">
+ <input type="radio" value="3" name="responsibility${peerId}">
+ <input type="radio" value="2" name="responsibility${peerId}">
+ <label><input type="radio" value="1" name="responsibility${peerId}">ungenügend</label>
+ </td>
+ </tr>
+ <tr>
+ <td align="center">
+ <h3>Anteil am Produkt</h3>
+ </td>
+ </tr>
+ <tr>
+ <td align="center">
+ <label>großer Anteil<input type="radio" value="5" name="partOfWork${peerId}"></label>
+ <input type="radio" value="4" name="partOfWork${peerId}">
+ <input type="radio" value="3" name="partOfWork${peerId}">
+ <input type="radio" value="2" name="partOfWork${peerId}">
+ <label><input type="radio" value="1" name="partOfWork${peerId}">geringer Anteil</label>
+ </td>
+ </tr>
+ <tr>
+ <td align="center">
+ <h3>Kooperationsbereitschaft</h3>
+ </td>
+ </tr>
+ <tr>
+ <td align="center">
+ <label>sehr kooperativ<input type="radio" value="5" name="cooperation${peerId}">
+ </label>
+ <input type="radio" value="4" name="cooperation${peerId}">
+ <input type="radio" value="3" name="cooperation${peerId}">
+ <input type="radio" value="2" name="cooperation${peerId}">
+ <label><input type="radio" value="1" name="cooperation${peerId}">nicht kooperativ</label>
+ </td>
+ </tr>
+ <tr>
+ <td align="center">
+ <h3>Disskusionsfähigkeit</h3>
+ </td>
+ </tr>
+ <tr>
+ <td align="center">
+ <label>gut kommuniziert und Meinung vertreten<input type="radio" value="5" name="communication${peerId}">
+ </label>
+ <input type="radio" value="4" name="communication${peerId}">
+ <input type="radio" value="3" name="communication${peerId}">
+ <input type="radio" value="2" name="communication${peerId}">
+ <label><input type="radio" value="1" name="communication${peerId}">keine Meinung und schlecht kommuniziert</label>
+ </td>
+ </tr>
+ <tr>
+ <td align="center">
+ <h3>Selbstständigkeit</h3>
+ </td>
+ </tr>
+ <tr>
+ <td align="center">
+ <label>selbstständig<input type="radio" value="5" name="autonomous${peerId}">
+ </label>
+ <input type="radio" value="4" name="autonomous${peerId}">
+ <input type="radio" value="3" name="autonomous${peerId}">
+ <input type="radio" value="2" name="autonomous${peerId}">
+ <label><input type="radio" value="1" name="autonomous${peerId}">abhängig</label>
+ </td>
+ </tr>
</table>
<div align="center">
- <button class="btn btn-primary" id="btnJournalStudent1" >zeige Lernzieltagebuch</button>
- <div id="eJournalStudent1">
- Fasel Blubba Bla
- </div>
+ <button class="btn btn-primary" id="btnJournal${peerId}">
+ zeige Lernzieltagebuch</button>
+ <div id="eJournal${peerId}">Fasel Blubba Bla</div>
</div>
- </div>
-
- <div class="item">
- <table class="table-striped peerStudent"
- style="width:70%;border:1px solid; margin:auto;" id="Student2">
- <tr>
- <td align="center">
- <img src="../assets/img/2.jpg" alt="Student2"
- style="width:20%;">
- </td>
- </tr>
- <tr>
- <td align="center">
- <h3>Verantwortungsbewusstsein</h3>
- </td>
- </tr>
- <tr>
- <td align="center">
- <label>stark ausgeprägt<input type="radio" value="5"
- name="responsibilityStudent2"></label>
- <input type="radio" value="4" name="responsibilityStudent2">
- <input type="radio" value="3" name="responsibilityStudent2">
- <input type="radio" value="2" name="responsibilityStudent2">
- <label><input type="radio" value="1" name="responsibilityStudent2">
- ungenügend</label>
- </td>
- </tr>
- <tr>
- <td align="center">
- <h3>Anteil am Produkt</h3>
- </td>
- </tr>
- <tr>
- <td align="center">
- <label>großer Anteil<input type="radio" value="5"
- name="partOfWorkStudent2"></label>
- <input type="radio" value="4" name="partOfWorkStudent2">
- <input type="radio" value="3" name="partOfWorkStudent2">
- <input type="radio" value="2" name="partOfWorkStudent2">
- <label><input type="radio" value="1" name="partOfWorkStudent2">
- geringer Anteil</label>
- </td>
- </tr>
- <tr>
- <td align="center">
- <h3>Kooperationsbereitschaft</h3>
- </td>
- </tr>
- <tr>
- <td align="center">
- <label>sehr kooperativ<input type="radio" value="5" name="cooperationStudent2">
- </label>
- <input type="radio" value="4" name="cooperationStudent2">
- <input type="radio" value="3" name="cooperationStudent2">
- <input type="radio" value="2" name="cooperationStudent2">
- <label><input type="radio" value="1" name="cooperationStudent2">
- nicht kooperativ</label>
- </td>
- </tr>
- <tr>
- <td align="center">
- <h3>Disskusionsfähigkeit</h3>
- </td>
- </tr>
- <tr>
- <td align="center">
- <label>gut kommuniziert und Meinung vertreten<input type="radio" value="5" name="communicationStudent2">
- </label>
- <input type="radio" value="4" name="communicationStudent2">
- <input type="radio" value="3" name="communicationStudent2">
- <input type="radio" value="2" name="communicationStudent2">
- <label><input type="radio" value="1" name="communicationStudent2">
- keine Meinung und schlecht kommuniziert</label>
- </td>
- </tr>
- <tr>
- <td align="center">
- <h3>Selbstständigkeit</h3>
- </td>
- </tr>
- <tr>
- <td align="center">
- <label>selbstständig<input type="radio" value="5" name="autonomousStudent2">
- </label>
- <input type="radio" value="4" name="autonomousStudent2">
- <input type="radio" value="3" name="autonomousStudent2">
- <input type="radio" value="2" name="autonomousStudent2">
- <label><input type="radio" value="1" name="autonomousStudent2">
- abhängig</label>
- </td>
- </tr>
- </table>
- <div align="center">
- <button class="btn btn-primary" id="btnJournalStudent2">zeige Lernzieltagebuch</button>
- <div id="eJournalStudent2">
- Fasel Blubba Bla
- </div>
- </div>
- </div>
-
- <div class="item">
- <table class="table-striped peerStudent"
- style="width:70%;border:1px solid; margin:auto;" id="Student3">
- <tr>
- <td align="center">
- <img src="../assets/img/3.jpg" alt="Student3"
- style="width:20%;">
- </td>
- </tr>
- <tr>
- <td align="center">
- <h3>Verantwortungsbewusstsein</h3>
- </td>
- </tr>
- <tr>
- <td align="center">
- <label>stark ausgeprägt<input type="radio" value="5"
- name="responsibilityStudent3"></label>
- <input type="radio" value="4" name="responsibilityStudent3">
- <input type="radio" value="3" name="responsibilityStudent3">
- <input type="radio" value="2" name="responsibilityStudent3">
- <label><input type="radio" value="1" name="responsibilityStudent3">
- ungenügend</label>
- </td>
- </tr>
- <tr>
- <td align="center">
- <h3>Anteil am Produkt</h3>
- </td>
- </tr>
- <tr>
- <td align="center">
- <label>großer Anteil<input type="radio" value="5"
- name="partOfWorkStudent3"></label>
- <input type="radio" value="4" name="partOfWorkStudent3">
- <input type="radio" value="3" name="partOfWorkStudent3">
- <input type="radio" value="2" name="partOfWorkStudent3">
- <label><input type="radio" value="1" name="partOfWorkStudent3">
- geringer Anteil</label>
- </td>
- </tr>
- <tr>
- <td align="center">
- <h3>Kooperationsbereitschaft</h3>
- </td>
- </tr>
- <tr>
- <td align="center">
- <label>sehr kooperativ<input type="radio" value="5" name="cooperationStudent3">
- </label>
- <input type="radio" value="4" name="cooperationStudent3">
- <input type="radio" value="3" name="cooperationStudent3">
- <input type="radio" value="2" name="cooperationStudent3">
- <label><input type="radio" value="1" name="cooperationStudent3">
- nicht kooperativ</label>
- </td>
- </tr>
- <tr>
- <td align="center">
- <h3>Disskusionsfähigkeit</h3>
- </td>
- </tr>
- <tr>
- <td align="center">
- <label>gut kommuniziert und Meinung vertreten<input type="radio" value="5" name="communicationStudent3">
- </label>
- <input type="radio" value="4" name="communicationStudent3">
- <input type="radio" value="3" name="communicationStudent3">
- <input type="radio" value="2" name="communicationStudent3">
- <label><input type="radio" value="1" name="communicationStudent3">
- keine Meinung und schlecht kommuniziert</label>
- </td>
- </tr>
- <tr>
- <td align="center">
- <h3>Selbstständigkeit</h3>
- </td>
- </tr>
- <tr>
- <td align="center">
- <label>selbstständig<input type="radio" value="5" name="autonomousStudent3">
- </label>
- <input type="radio" value="4" name="autonomousStudent3">
- <input type="radio" value="3" name="autonomousStudent3">
- <input type="radio" value="2" name="autonomousStudent3">
- <label><input type="radio" value="1" name="autonomousStudent3">
- abhängig</label>
- </td>
- </tr>
- </table>
- <div align="center">
- <button class="btn btn-primary" id="btnJournalStudent3">zeige Lernzieltagebuch</button>
- <div id="eJournalStudent3" align="center">
- Fasel Blubba Bla
- </div>
</div>
- </div>-->
+ </script>
</div>
<!-- Left and right controls -->
diff --git a/gemeinsamforschen/src/main/webapp/assessment/js/assess-work.js b/gemeinsamforschen/src/main/webapp/assessment/js/assess-work.js
index 6a50e8e7938c1f74b60c39dfaf191631f163fcaa..f13c4e9f370974991d62028e0259e2bc9ed82f4b 100644
--- a/gemeinsamforschen/src/main/webapp/assessment/js/assess-work.js
+++ b/gemeinsamforschen/src/main/webapp/assessment/js/assess-work.js
@@ -27,101 +27,16 @@ function buildTablesForPeers() {
success: function (peers) {
let div = document.getElementById('peerTable');
for (let peer = 0; peer < peers.length; peer++) {
- let tablePeer = document.createElement('DIV');
- if (peer === 0) {
- tablePeer.className = "item active";
- } else {
- tablePeer.className = "item";
- }
- let innerPeerTable = '<table class="table-striped peerStudent" id="' + peers[peer] + '">' +
- '<tr>' +
- '<td align="center">' +
- '<img src="../assets/img/noImg.png" alt="' + peers[peer] + '" style="width:20%;">' +
- '</td>' +
- '</tr>' +
- '<tr>' +
- '<td align="center">' +
- '<h3>Verantwortungsbewusstsein</h3>' +
- '</td>' +
- '</tr>' +
- '<tr>' +
- '<td align="center">' +
- '<label>stark ausgeprägt<input type="radio" value="5" name="responsibility' + peers[peer] + '"></label>' +
- '<input type="radio" value="4" name="responsibility' + peers[peer] + '">' +
- '<input type="radio" value="3" name="responsibility' + peers[peer] + '">' +
- '<input type="radio" value="2" name="responsibility' + peers[peer] + '">' +
- '<label><input type="radio" value="1" name="responsibility' + peers[peer] + '">ungenügend</label>' +
- '</td>' +
- '</tr>' +
- '<tr>' +
- '<td align="center">' +
- '<h3>Anteil am Produkt</h3>' +
- '</td>' +
- '</tr>' +
- '<tr>' +
- '<td align="center">' +
- '<label>großer Anteil<input type="radio" value="5" name="partOfWork' + peers[peer] + '"></label>' +
- '<input type="radio" value="4" name="partOfWork' + peers[peer] + '">' +
- '<input type="radio" value="3" name="partOfWork' + peers[peer] + '">' +
- '<input type="radio" value="2" name="partOfWork' + peers[peer] + '">' +
- '<label><input type="radio" value="1" name="partOfWork' + peers[peer] + '">geringer Anteil</label>' +
- '</td>' +
- '</tr>' +
- '<tr>' +
- '<td align="center">' +
- '<h3>Kooperationsbereitschaft</h3>' +
- '</td>' +
- '</tr>' +
- '<tr>' +
- '<td align="center">' +
- '<label>sehr kooperativ<input type="radio" value="5" name="cooperation' + peers[peer] + '">' +
- '</label>' +
- '<input type="radio" value="4" name="cooperation' + peers[peer] + '">' +
- '<input type="radio" value="3" name="cooperation' + peers[peer] + '">' +
- '<input type="radio" value="2" name="cooperation' + peers[peer] + '">' +
- '<label><input type="radio" value="1" name="cooperation' + peers[peer] + '">nicht kooperativ</label>' +
- '</td>' +
- '</tr>' +
- '<tr>' +
- '<td align="center">' +
- '<h3>Disskusionsfähigkeit</h3>' +
- '</td>' +
- '</tr>' +
- '<tr>' +
- '<td align="center">' +
- '<label>gut kommuniziert und Meinung vertreten<input type="radio" value="5" name="communication' + peers[peer] + '">' +
- '</label>' +
- '<input type="radio" value="4" name="communication' + peers[peer] + '">' +
- '<input type="radio" value="3" name="communication' + peers[peer] + '">' +
- '<input type="radio" value="2" name="communication' + peers[peer] + '">' +
- '<label><input type="radio" value="1" name="communication' + peers[peer] + '">keine Meinung und schlecht kommuniziert</label>' +
- '</td>' +
- '</tr>' +
- '<tr>' +
- '<td align="center">' +
- '<h3>Selbstständigkeit</h3>' +
- '</td>' +
- '</tr>' +
- '<tr>' +
- '<td align="center">' +
- '<label>selbstständig<input type="radio" value="5" name="autonomous' + peers[peer] + '">' +
- '</label>' +
- '<input type="radio" value="4" name="autonomous' + peers[peer] + '">' +
- '<input type="radio" value="3" name="autonomous' + peers[peer] + '">' +
- '<input type="radio" value="2" name="autonomous' + peers[peer] + '">' +
- '<label><input type="radio" value="1" name="autonomous' + peers[peer] + '">abhängig</label>' +
- '</td>' +
- '</tr>' +
- '</table>' +
- '<div align="center">' +
- ' <button class="btn btn-primary" id="btnJournal' + peers[peer] + '">' +
- ' zeige Lernzieltagebuch</button>' +
- ' <div id="eJournal' + peers[peer] + '">Fasel Blubba Bla</div>' +
- '</div>';
- tablePeer.innerHTML = innerPeerTable;
- div.appendChild(tablePeer);
- $('#btnJournal' + peers[peer]).on("click", function () {
- $('#eJournal' + peers[peer]).toggle();
+ let peerId = peers[peer].replace("@","").replace(".","");
+ let tmplObject={
+ peerId: peerId,
+ first: null
+ };
+ if (peer===0)
+ tmplObject.first=1;
+ $('#peerTemplate').tmpl(tmplObject).appendTo(div);
+ $('#btnJournal' +peerId).on("click", function () {
+ $('#eJournal' +peerId).toggle();
});
}
},
diff --git a/gemeinsamforschen/src/main/webapp/project/tasks-student.jsp b/gemeinsamforschen/src/main/webapp/project/tasks-student.jsp
index d56eb5756c191cafd703845eb78b977f0a37c580..c57e6d5960a786d493373dde547648af6b87983f 100644
--- a/gemeinsamforschen/src/main/webapp/project/tasks-student.jsp
+++ b/gemeinsamforschen/src/main/webapp/project/tasks-student.jsp
@@ -55,133 +55,6 @@
</script>
</div>
-
-<!-- Aufgabe -->
-
-<%--
-
- <!-- Aufgabe -->
- <div class="card card-draft">
- <div class="col span_s_of_2 icon grouptask">
-
- </div>
-
- <div class="col span_l_of_2">
- <button class="primary" id="create-feedback">Schreibe ein Feedback</button>
- </div>
-
- <div class="status icon"><p>Noch drei Tage Zeit</p></div>
- <div style="clear:left"></div>
-
- </div>
- <!-- Aufgabe -->
- <div class="card card-draft">
- <div class="col span_s_of_2 icon grouptask">
-
- </div>
-
- <div class="col span_l_of_2">
- <a href="#">Gib Feedback zu einem Forschungsdossier</a>
- </div>
-
- <div class="status icon"><p>Noch drei Tage Zeit</p></div>
- <div style="clear:left"></div>
-
- </div>
-
-
-
-<div class="card card-feedback">
- <div class="col span_s_of_2 icon infotask">
- </div>
-
- <div class="col span_l_of_2">
- <h4> Erhalte 3 Feedbacks </h4>
- <div class="shoulds">
- <i class="fas fa-check-circle"></i>
- <i class="fas fa-check-circle"></i>
- <i class="far fa-circle"></i>
- </div>
- <ul class="list">
- <li><a href="#">Feedback 1</a></li>
- <li><a href="#">Feedback 2</a></li>
-
- </ul>
- </div>
- <div class="status icon"><p>Noch drei Tage Zeit</p></div>
- <div style="clear:left"></div>
-
-</div>
-
-<!-- Aufgabe -->
-<div class="card card-grouping">
- <div class="col span_s_of_2 icon usertask">
- </div>
-
- <div class="col span_l_of_2">
- <button class="primary">Schreibe ein Feedback</button>
- <a href="#">Regeln fürs Feedback schreiben</a>
- </div>
- <div class="status alert icon"><p>Du bist zu spät.</p></div>
- <div style="clear:left"></div>
-
-</div>
-
-
-<!-- Aufgabe -->
-<div class="card card-execution">
- <div class="col span_s_of_2 icon grouptask ">
-
- </div>
-
- <div class="col span_l_of_2">
- <button class="primary">Schließe das Dossier ab</button>
- <p>Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore
- et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea
- rebum.</p>
- </div>
- <div class="status icon"></div>
- <div style="clear:left"></div>
-
-</div>
-
-<!-- Aufgabe -->
-<div class="card card-assessment">
- <div class="col span_s_of_2 icon grouptask ">
-
- </div>
-
- <div class="col span_l_of_2">
- <button class="primary">Schließe das Dossier ab</button>
- <p>Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore
- et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea
- rebum.</p>
- </div>
- <div class="status icon"><p>Noch drei Tage Zeit</p></div>
- <div style="clear:left"></div>
-
-</div>
-
-<!-- Aufgabe -->
-<div class="card card-grades">
- <div class="col span_s_of_2 icon grouptask ">
-
- </div>
-
- <div class="col span_l_of_2">
- <button class="primary">Schließe das Dossier ab</button>
- <br>
- <input type="checkbox" name="vehicle1" value="Bike"> Is erledigt <br>
- <p>Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore
- et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea
- rebum.</p>
- </div>
- <div class="status icon"></div>
- <div style="clear:left"></div>
-
-</div>--%>
-
-</div>
<footer:footer/>
</body>
diff --git a/gemeinsamforschen/src/test/java/unipotsdam/gf/interfaces/AnnotationTest.java b/gemeinsamforschen/src/test/java/unipotsdam/gf/interfaces/AnnotationTest.java
index c92d7161cd6e08ad28314e873c2956884307b516..ffb941dd20e4640a6f3a3372c53786277fdc2604 100644
--- a/gemeinsamforschen/src/test/java/unipotsdam/gf/interfaces/AnnotationTest.java
+++ b/gemeinsamforschen/src/test/java/unipotsdam/gf/interfaces/AnnotationTest.java
@@ -1,7 +1,11 @@
package unipotsdam.gf.interfaces;
+import org.glassfish.hk2.api.ServiceLocator;
+import org.glassfish.hk2.utilities.ServiceLocatorUtilities;
import org.junit.Before;
import org.junit.Test;
+import org.mockito.Mockito;
+import unipotsdam.gf.core.database.TestGFApplicationBinder;
import unipotsdam.gf.modules.annotation.controller.AnnotationController;
import unipotsdam.gf.modules.annotation.model.Annotation;
import unipotsdam.gf.modules.annotation.model.AnnotationBody;
@@ -9,6 +13,7 @@ import unipotsdam.gf.modules.annotation.model.AnnotationPatchRequest;
import unipotsdam.gf.modules.annotation.model.AnnotationPostRequest;
import unipotsdam.gf.modules.feedback.Category;
+import javax.inject.Inject;
import java.util.ArrayList;
import static org.junit.Assert.assertEquals;
@@ -22,12 +27,15 @@ import static org.junit.Assert.assertTrue;
public class AnnotationTest {
// declare annotation controller
- AnnotationController controller;
+
+ @Inject
+ private AnnotationController controller;
@Before
- public void initializeTest() {
- // initialize controller
- controller = new AnnotationController();
+ public void setUp() {
+ final ServiceLocator locator = ServiceLocatorUtilities.bind(new TestGFApplicationBinder());
+ locator.inject(this);
+
}
@Test
diff --git a/gemeinsamforschen/src/test/java/unipotsdam/gf/modules/annotation/FeedbackTest.java b/gemeinsamforschen/src/test/java/unipotsdam/gf/modules/annotation/FeedbackTest.java
deleted file mode 100644
index d6a8d9460a2f68d6f184066d3fadc729f9cd5246..0000000000000000000000000000000000000000
--- a/gemeinsamforschen/src/test/java/unipotsdam/gf/modules/annotation/FeedbackTest.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package unipotsdam.gf.modules.annotation;
-
-import org.glassfish.hk2.api.ServiceLocator;
-import org.glassfish.hk2.utilities.ServiceLocatorUtilities;
-import org.junit.Before;
-import org.junit.Test;
-import unipotsdam.gf.config.GFApplicationBinder;
-import unipotsdam.gf.modules.feedback.Category;
-import unipotsdam.gf.modules.project.Project;
-import unipotsdam.gf.modules.submission.model.FullSubmission;
-import unipotsdam.gf.modules.user.User;
-import unipotsdam.gf.process.tasks.FeedbackTaskData;
-import unipotsdam.gf.process.tasks.TaskDAO;
-
-import javax.inject.Inject;
-
-import static org.hamcrest.Matchers.is;
-import static org.junit.Assert.assertThat;
-
-public class FeedbackTest {
-
- @Inject
- TaskDAO taskDAO;
-
- @Before
- public void setUp() {
- final ServiceLocator locator = ServiceLocatorUtilities.bind(new GFApplicationBinder());
- locator.inject(this);
-
- }
-
- @Test
- public void testGivingFeedbackTask() {
- User user = new User("vodkas@yolo.com");
- Project project = new Project("test3");
- FullSubmission fullSubmission = new FullSubmission("476000b6-1a6c-402e-abf5-f4a32d12dfa0");
- FeedbackTaskData feedbackTaskData = new FeedbackTaskData(user, fullSubmission, Category.RECHERCHE);
-
- taskDAO.persistFeedbackTask(project, feedbackTaskData);
-
- }
-}
diff --git a/gemeinsamforschen/src/test/java/unipotsdam/gf/modules/assessment/TestAddAssessment.java b/gemeinsamforschen/src/test/java/unipotsdam/gf/modules/assessment/TestAddAssessment.java
index 831ffc8fd5ca59948d6d71a443120f8bbbb938a4..f4fd69673292b6ca8874e056387c9fddd2cfdaee 100644
--- a/gemeinsamforschen/src/test/java/unipotsdam/gf/modules/assessment/TestAddAssessment.java
+++ b/gemeinsamforschen/src/test/java/unipotsdam/gf/modules/assessment/TestAddAssessment.java
@@ -1,6 +1,10 @@
package unipotsdam.gf.modules.assessment;
+import org.glassfish.hk2.api.ServiceLocator;
+import org.glassfish.hk2.utilities.ServiceLocatorUtilities;
+import org.junit.Before;
import org.junit.Test;
+import unipotsdam.gf.core.database.TestGFApplicationBinder;
import unipotsdam.gf.mysql.MysqlConnect;
import unipotsdam.gf.mysql.VereinfachtesResultSet;
import unipotsdam.gf.interfaces.IPeerAssessment;
@@ -19,7 +23,8 @@ import java.util.Map;
public class TestAddAssessment {
- private IPeerAssessment peer = new PeerAssessment();
+ @Inject
+ private IPeerAssessment peer;
private String userName = "Kevin";
private String projectName = "test a la test";
private String quizId = "Whats a good Test?";
@@ -27,6 +32,13 @@ public class TestAddAssessment {
@Inject
MysqlConnect connect;
+ @Before
+ public void setUp() {
+ final ServiceLocator locator = ServiceLocatorUtilities.bind(new TestGFApplicationBinder());
+ locator.inject(this);
+
+ }
+
@Test
public void createQuiz() {
StudentAndQuiz studentAndQuiz = new StudentAndQuiz();
diff --git a/gemeinsamforschen/src/test/java/unipotsdam/gf/modules/assessment/TestAddAssessment.java.orig b/gemeinsamforschen/src/test/java/unipotsdam/gf/modules/assessment/TestAddAssessment.java.orig
deleted file mode 100644
index fc6d0b82300f4564e268c6c424b39ebabab144c3..0000000000000000000000000000000000000000
--- a/gemeinsamforschen/src/test/java/unipotsdam/gf/modules/assessment/TestAddAssessment.java.orig
+++ /dev/null
@@ -1,161 +0,0 @@
-package unipotsdam.gf.modules.assessment;
-
-import org.junit.Test;
-import unipotsdam.gf.core.database.mysql.MysqlConnect;
-import unipotsdam.gf.core.database.mysql.VereinfachtesResultSet;
-import unipotsdam.gf.interfaces.IPeerAssessment;
-<<<<<<< HEAD
-import unipotsdam.gf.modules.assessment.controller.model.*;
-=======
-import unipotsdam.gf.modules.assessment.controller.model.GroupEvalDataDatasets;
-import unipotsdam.gf.modules.assessment.controller.model.GroupEvalDataList;
-import unipotsdam.gf.modules.assessment.controller.model.Quiz;
-import unipotsdam.gf.modules.assessment.controller.model.StudentAndQuiz;
-import unipotsdam.gf.modules.assessment.controller.model.StudentIdentifier;
-import unipotsdam.gf.modules.assessment.controller.service.FBAssessement;
->>>>>>> origin/development_master
-import unipotsdam.gf.modules.assessment.controller.service.PeerAssessment;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-<<<<<<< HEAD
-
-=======
->>>>>>> origin/development_master
-import java.util.Map;
-
-public class TestAddAssessment {
-
- private IPeerAssessment peer = new PeerAssessment();
- private String userName = "Kevin";
- private String projectName = "test a la test";
- private String quizId = "Whats a good Test?";
-
- @Test
- public void createQuiz() {
- StudentAndQuiz studentAndQuiz = new StudentAndQuiz();
- StudentIdentifier student = new StudentIdentifier(projectName, userName);
- studentAndQuiz.setStudentIdentifier(student);
- Quiz quiz = new Quiz();
- ArrayList<String> correctAnswers = new ArrayList<>();
- correctAnswers.add("1");
- correctAnswers.add("2");
- correctAnswers.add("3");
- ArrayList<String> incorrectAnswers = new ArrayList<>();
- incorrectAnswers.add("4");
- incorrectAnswers.add("5");
- incorrectAnswers.add("6");
- quiz.setQuestion(quizId);
- quiz.setIncorrectAnswers(incorrectAnswers);
- quiz.setType("mc");
- quiz.setCorrectAnswers(correctAnswers);
- studentAndQuiz.setQuiz(quiz);
- peer.createQuiz(studentAndQuiz);
- }
-
- @Test
- public void getAllQuizzesInProject() {
- peer.getQuiz(projectName);
- }
-
- @Test
- public void getQuiz() {
- peer.getQuiz(projectName, quizId, userName);
- }
-
- @Test
- public void answerQuiz() {
- Map<String, List<String>> questions = new HashMap<>();
- StudentIdentifier student = new StudentIdentifier(projectName, userName);
- List<String> answers = new ArrayList<>();
- answers.add("1");
- answers.add("2");
- answers.add("3");
- questions.put(quizId, answers);
- peer.answerQuiz(questions, student);
- }
-
- @Test
- public void deleteQuiz() {
- peer.deleteQuiz(quizId);
- }
-
- @Test
- public void addTestAssessment() {
- int [] quizAnswers = new int[5];
- quizAnswers[0] = 0;
- quizAnswers[1] = 1;
- quizAnswers[2] = 0;
- quizAnswers[3] = 1;
- quizAnswers[4] = 1;
- int [] workRating = new int[3];
- workRating[0] = 5; //Führungsqualität
- workRating[1] = 1; //Pünktlichkeit
- workRating[2] = 4; //Hilfsbereitschaft oder so
-
- StudentIdentifier student = new StudentIdentifier("Spaß", "Haralf");
- //Performance performance = new Performance(student, quizAnswers,"so ein toller Typ", workRating);
- //Assessment assessment = new Assessment(student, performance);
- //iPeerAssessment.addAssessmentDataToDB(assessment);
- }
-
- @Test
- public void meanOfAssessments() {
- double Ergebnis = 0.0;
- double zwischenErgebnis = 0.0;
- double counter = 0.0;
- List<Double> results = new ArrayList<>();
- MysqlConnect connect = new MysqlConnect();
-
- connect.connect();
- String mysqlRequest = "SELECT * FROM `assessments` WHERE `empfaengerId`=? AND `projektId`=?";
- String test = "fgnxn";
- String test2 = "projekt";
- VereinfachtesResultSet ausgabe = connect.issueSelectStatement(mysqlRequest, test, test2);
- while (ausgabe.next()) {
- counter++;
- zwischenErgebnis = zwischenErgebnis + ausgabe.getInt("bewertung");
- results.add((double) ausgabe.getInt("bewertung"));
- }
- results.add(zwischenErgebnis / counter);
- System.out.println(results);
- //Integer bewertung = ausgabe.getInt("bewertung");
- connect.close();
- }
-
- @Test
- public void groupDatafromDB() {
- MysqlConnect connect = new MysqlConnect();
- List<String> userNamen = new ArrayList<>();
- GroupEvalDataDatasets datenSaetze = new GroupEvalDataDatasets();
- GroupEvalDataList datenDia = new GroupEvalDataList();
- connect.connect();
-
- String mysqlRequestGroupuser = "SELECT * FROM `groupuser` WHERE `groupId`=? ";
-
- VereinfachtesResultSet namenDerUser = connect.issueSelectStatement(mysqlRequestGroupuser, 3);
- int[] bewertungenZwischen = new int[10];
- while (namenDerUser.next()) {
- userNamen.add(namenDerUser.getString("userEmail"));
- }
- for (int i = 0; i < userNamen.size(); i++) {
- String mysqlRequestAssessment = "SELECT * FROM `assessments` WHERE `empfaengerId`=?";
- VereinfachtesResultSet bewertungDerUser = connect.issueSelectStatement(mysqlRequestAssessment, userNamen.get(i));
-
- while (bewertungDerUser.next()) {
- //bewertungenZwischen.add(bewertungDerUser.getInt("bewertung"));
- System.out.println("Hass");
- }
- datenSaetze.setData(bewertungenZwischen);
- //datenSaetze.setLabel(userNamen.get(i));
- datenDia.appendDataSet(datenSaetze);
- System.out.println(datenSaetze.getData());
- System.out.println(datenSaetze.getLabel());
-
- }
- connect.close();
- }
-
-
-}