Skip to content
Snippets Groups Projects
Commit f8fae505 authored by Julian Dehne's avatar Julian Dehne
Browse files

Merge remote-tracking branch 'origin/single-user-project' into single-user-project 

# Conflicts:
#	gemeinsamforschen/src/main/java/unipotsdam/gf/config/GFApplicationBinder.java
parents cbd47ea9 194c92ea
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 167 additions and 592 deletions
gemeinsamforschen/src/main/java/unipotsdam/gf/config/GFApplicationBinder.java
+ 2
− 7
View file @ f8fae505
...@@ -9,8 +9,6 @@ import unipotsdam.gf.modules.communication.service.CommunicationDummyService; ...@@ -9,8 +9,6 @@ import unipotsdam.gf.modules.communication.service.CommunicationDummyService;
import unipotsdam.gf.modules.group.DummyGroupfinding; import unipotsdam.gf.modules.group.DummyGroupfinding;
import unipotsdam.gf.modules.group.DummyProjectCreationService; import unipotsdam.gf.modules.group.DummyProjectCreationService;
import unipotsdam.gf.modules.group.GroupDAO; 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.Management;
import unipotsdam.gf.modules.project.ManagementImpl; import unipotsdam.gf.modules.project.ManagementImpl;
import unipotsdam.gf.modules.project.ProjectConfigurationDAO; import unipotsdam.gf.modules.project.ProjectConfigurationDAO;
...@@ -31,20 +29,17 @@ import unipotsdam.gf.session.GFContexts; ...@@ -31,20 +29,17 @@ import unipotsdam.gf.session.GFContexts;
public class GFApplicationBinder extends AbstractBinder { public class GFApplicationBinder extends AbstractBinder {
/**
* TODO replace DummyImplementation
*/
@Override @Override
protected void configure() { protected void configure() {
bind(CommunicationDummyService.class).to(ICommunication.class); bind(CommunicationDummyService.class).to(ICommunication.class);
bind(ManagementImpl.class).to(Management.class); bind(ManagementImpl.class).to(Management.class);
bind(PeerAssessment.class).to(IPeerAssessment.class); bind(PeerAssessment.class).to(IPeerAssessment.class);
bind(PhasesImpl.class).to(IPhases.class); bind(PhasesImpl.class).to(IPhases.class);
bind(ManagementImpl.class).to(Management.class); bind(ManagementImpl.class).to(Management.class);
bind(DummyResearchReportManagement.class).to(ResearchReportManagement.class); bind(DummyResearchReportManagement.class).to(ResearchReportManagement.class);
bind(DummyGroupfinding.class).to(IGroupFinding.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(AssessmentDBCommunication.class).to(AssessmentDBCommunication.class);
bind(GFContexts.class).to(GFContexts.class); bind(GFContexts.class).to(GFContexts.class);
bind(ProjectCreationProcess.class).to(ProjectCreationProcess.class); bind(ProjectCreationProcess.class).to(ProjectCreationProcess.class);
......
gemeinsamforschen/src/main/java/unipotsdam/gf/modules/assessment/controller/service/AssessmentDBCommunication.java
+ 13
− 24
View file @ f8fae505
...@@ -42,7 +42,7 @@ public class AssessmentDBCommunication { ...@@ -42,7 +42,7 @@ public class AssessmentDBCommunication {
ArrayList<Map<String, Double>> result = new ArrayList<>(); ArrayList<Map<String, Double>> result = new ArrayList<>();
connect.connect(); connect.connect();
String mysqlRequest = "SELECT * FROM `workrating` WHERE `projectName`=? AND `userName`=?"; String mysqlRequest = "SELECT * FROM `workrating` WHERE `projectName`=? AND `userEmail`=?";
VereinfachtesResultSet vereinfachtesResultSet = VereinfachtesResultSet vereinfachtesResultSet =
connect.issueSelectStatement(mysqlRequest, student.getProjectName(), student.getUserEmail()); connect.issueSelectStatement(mysqlRequest, student.getProjectName(), student.getUserEmail());
boolean next = vereinfachtesResultSet.next(); boolean next = vereinfachtesResultSet.next();
...@@ -60,7 +60,7 @@ public class AssessmentDBCommunication { ...@@ -60,7 +60,7 @@ public class AssessmentDBCommunication {
Boolean getWorkRating(StudentIdentifier student, String fromStudent) { Boolean getWorkRating(StudentIdentifier student, String fromStudent) {
connect.connect(); 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 = VereinfachtesResultSet vereinfachtesResultSet =
connect.issueSelectStatement(mysqlRequest, student.getProjectName(), student.getUserEmail(), connect.issueSelectStatement(mysqlRequest, student.getProjectName(), student.getUserEmail(),
fromStudent); fromStudent);
...@@ -74,32 +74,21 @@ public class AssessmentDBCommunication { ...@@ -74,32 +74,21 @@ public class AssessmentDBCommunication {
VereinfachtesResultSet vereinfachtesResultSet = connect.issueSelectStatement(mysqlRequest, projectID); VereinfachtesResultSet vereinfachtesResultSet = connect.issueSelectStatement(mysqlRequest, projectID);
boolean next = vereinfachtesResultSet.next(); boolean next = vereinfachtesResultSet.next();
while (next) { while (next) {
result.add(vereinfachtesResultSet.getString("userID")); result.add(vereinfachtesResultSet.getString("userEmail"));
next = vereinfachtesResultSet.next(); next = vereinfachtesResultSet.next();
} }
return result; return result;
} }
Integer getGroupByStudent(StudentIdentifier student) { ArrayList<String> getStudentsByGroupAndProject(Integer groupId) {
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> result = new ArrayList<>(); ArrayList<String> result = new ArrayList<>();
connect.connect(); connect.connect();
String mysqlRequest = "SELECT * FROM `groupuser` WHERE `groupId`=? AND `projectName`=?"; String mysqlRequest = "SELECT * FROM `groupuser` WHERE `groupId`=?";
VereinfachtesResultSet vereinfachtesResultSet = VereinfachtesResultSet vereinfachtesResultSet =
connect.issueSelectStatement(mysqlRequest, groupId, projectName); connect.issueSelectStatement(mysqlRequest, groupId);
Boolean next = vereinfachtesResultSet.next(); Boolean next = vereinfachtesResultSet.next();
while (next) { while (next) {
result.add(vereinfachtesResultSet.getString("userName")); result.add(vereinfachtesResultSet.getString("userEmail"));
next = vereinfachtesResultSet.next(); next = vereinfachtesResultSet.next();
} }
return result; return result;
...@@ -148,7 +137,7 @@ public class AssessmentDBCommunication { ...@@ -148,7 +137,7 @@ public class AssessmentDBCommunication {
ArrayList<Integer> getAnsweredQuizzes(StudentIdentifier student) { ArrayList<Integer> getAnsweredQuizzes(StudentIdentifier student) {
ArrayList<Integer> result = new ArrayList<>(); ArrayList<Integer> result = new ArrayList<>();
connect.connect(); connect.connect();
String mysqlRequest = "SELECT * FROM `answeredquiz` WHERE `projectName`=? AND `userName`=?"; String mysqlRequest = "SELECT * FROM `answeredquiz` WHERE `projectName`=? AND `userEmail`=?";
VereinfachtesResultSet vereinfachtesResultSet = VereinfachtesResultSet vereinfachtesResultSet =
connect.issueSelectStatement(mysqlRequest, student.getProjectName(), student.getUserEmail()); connect.issueSelectStatement(mysqlRequest, student.getProjectName(), student.getUserEmail());
boolean next = vereinfachtesResultSet.next(); boolean next = vereinfachtesResultSet.next();
...@@ -164,7 +153,7 @@ public class AssessmentDBCommunication { ...@@ -164,7 +153,7 @@ public class AssessmentDBCommunication {
connect.connect(); connect.connect();
for (String question : questions.keySet()) { for (String question : questions.keySet()) {
String mysqlRequest = 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(), connect.issueInsertOrDeleteStatement(mysqlRequest, student.getProjectName(), student.getUserEmail(),
question, questions.get(question)); question, questions.get(question));
} }
...@@ -174,7 +163,7 @@ public class AssessmentDBCommunication { ...@@ -174,7 +163,7 @@ public class AssessmentDBCommunication {
void writeWorkRatingToDB(StudentIdentifier student, String fromStudent, Map<String, Integer> workRating) { void writeWorkRatingToDB(StudentIdentifier student, String fromStudent, Map<String, Integer> workRating) {
connect.connect(); connect.connect();
String mysqlRequest = 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(), connect.issueInsertOrDeleteStatement(mysqlRequest, student.getProjectName(), student.getUserEmail(),
fromStudent, workRating.get("responsibility"), workRating.get("partOfWork"), fromStudent, workRating.get("responsibility"), workRating.get("partOfWork"),
workRating.get("cooperation"), workRating.get("communication"), workRating.get("autonomous")); workRating.get("cooperation"), workRating.get("communication"), workRating.get("autonomous"));
...@@ -184,7 +173,7 @@ public class AssessmentDBCommunication { ...@@ -184,7 +173,7 @@ public class AssessmentDBCommunication {
Integer getWhichGroupToRate(StudentIdentifier student) { Integer getWhichGroupToRate(StudentIdentifier student) {
Integer result; Integer result;
connect.connect(); connect.connect();
String mysqlRequest1 = "SELECT groupId FROM `groupuser` WHERE `projectName`=? AND `userName`=? "; String mysqlRequest1 = "SELECT groupId FROM `groupuser` WHERE `projectName`=? AND `userEmail`=? ";
VereinfachtesResultSet vereinfachtesResultSet1 = VereinfachtesResultSet vereinfachtesResultSet1 =
connect.issueSelectStatement(mysqlRequest1, student.getProjectName(), student.getUserEmail()); connect.issueSelectStatement(mysqlRequest1, student.getProjectName(), student.getUserEmail());
vereinfachtesResultSet1.next(); vereinfachtesResultSet1.next();
...@@ -213,7 +202,7 @@ public class AssessmentDBCommunication { ...@@ -213,7 +202,7 @@ public class AssessmentDBCommunication {
void writeContributionRatingToDB(String groupId, String fromStudent, Map<String, Integer> contributionRating) { void writeContributionRatingToDB(String groupId, String fromStudent, Map<String, Integer> contributionRating) {
connect.connect(); connect.connect();
String mysqlRequest = 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"), connect.issueInsertOrDeleteStatement(mysqlRequest, groupId, fromStudent, contributionRating.get("dossier"),
contributionRating.get("research")); contributionRating.get("research"));
connect.close(); connect.close();
...@@ -221,7 +210,7 @@ public class AssessmentDBCommunication { ...@@ -221,7 +210,7 @@ public class AssessmentDBCommunication {
void writeGradesToDB(Map<StudentIdentifier, Double> grade) { void writeGradesToDB(Map<StudentIdentifier, Double> grade) {
connect.connect(); 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()) { for (StudentIdentifier student : grade.keySet()) {
connect.issueInsertOrDeleteStatement(mysqlRequest, student.getProjectName(), student.getUserEmail(), connect.issueInsertOrDeleteStatement(mysqlRequest, student.getProjectName(), student.getUserEmail(),
grade.get(student)); grade.get(student));
......
gemeinsamforschen/src/main/java/unipotsdam/gf/modules/assessment/controller/service/PeerAssessment.java
+ 7
− 3
View file @ f8fae505
package unipotsdam.gf.modules.assessment.controller.service; package unipotsdam.gf.modules.assessment.controller.service;
import unipotsdam.gf.modules.group.GroupDAO;
import unipotsdam.gf.modules.project.Management; import unipotsdam.gf.modules.project.Management;
import unipotsdam.gf.modules.project.Project; import unipotsdam.gf.modules.project.Project;
import unipotsdam.gf.process.constraints.ConstraintsMessages; import unipotsdam.gf.process.constraints.ConstraintsMessages;
...@@ -26,6 +27,9 @@ public class PeerAssessment implements IPeerAssessment { ...@@ -26,6 +27,9 @@ public class PeerAssessment implements IPeerAssessment {
@Inject @Inject
private AssessmentDBCommunication assessmentDBCommunication; private AssessmentDBCommunication assessmentDBCommunication;
@Inject
private GroupDAO groupDAO;
@Override @Override
public void finalizeAssessment(String projectName){ public void finalizeAssessment(String projectName){
cheatCheckerMethods method = assessmentDBCommunication.getAssessmentMethod(projectName); cheatCheckerMethods method = assessmentDBCommunication.getAssessmentMethod(projectName);
...@@ -70,8 +74,8 @@ public class PeerAssessment implements IPeerAssessment { ...@@ -70,8 +74,8 @@ public class PeerAssessment implements IPeerAssessment {
@Override @Override
public String whatToRate(StudentIdentifier student) { public String whatToRate(StudentIdentifier student) {
Integer groupId = assessmentDBCommunication.getGroupByStudent(student); Integer groupId = groupDAO.getGroupByStudent(student);
ArrayList<String> groupMembers = assessmentDBCommunication.getStudentsByGroupAndProject(groupId, student.getProjectName()); ArrayList<String> groupMembers = assessmentDBCommunication.getStudentsByGroupAndProject(groupId);
for (String peer : groupMembers) { for (String peer : groupMembers) {
if (!peer.equals(student.getUserEmail())) { if (!peer.equals(student.getUserEmail())) {
StudentIdentifier groupMember = new StudentIdentifier(student.getProjectName(), peer); StudentIdentifier groupMember = new StudentIdentifier(student.getProjectName(), peer);
...@@ -130,7 +134,7 @@ public class PeerAssessment implements IPeerAssessment { ...@@ -130,7 +134,7 @@ public class PeerAssessment implements IPeerAssessment {
Integer groupId; Integer groupId;
Performance performance = new Performance(); Performance performance = new Performance();
StudentIdentifier userNameentifier = new StudentIdentifier(projectName, student); StudentIdentifier userNameentifier = new StudentIdentifier(projectName, student);
groupId = assessmentDBCommunication.getGroupByStudent(userNameentifier); groupId = groupDAO.getGroupByStudent(userNameentifier);
//todo: answered quizzes vervöllstandigen //todo: answered quizzes vervöllstandigen
Integer numberOfQuizzes = assessmentDBCommunication.getQuizCount(projectName); Integer numberOfQuizzes = assessmentDBCommunication.getQuizCount(projectName);
List<Integer> answeredQuizzes = assessmentDBCommunication.getAnsweredQuizzes(userNameentifier); List<Integer> answeredQuizzes = assessmentDBCommunication.getAnsweredQuizzes(userNameentifier);
......
gemeinsamforschen/src/main/java/unipotsdam/gf/modules/assessment/controller/view/QuizView.java
+ 2
− 1
View file @ f8fae505
...@@ -23,7 +23,8 @@ import java.util.Map; ...@@ -23,7 +23,8 @@ import java.util.Map;
@Path("/assessments") @Path("/assessments")
public class QuizView { public class QuizView {
private static IPeerAssessment peer = new PeerAssessment(); //correct DB-conn and stuff @Inject
private IPeerAssessment peer; //correct DB-conn and stuff
@Inject @Inject
Management management; Management management;
......
gemeinsamforschen/src/main/java/unipotsdam/gf/modules/group/GroupDAO.java
+ 18
− 12
View file @ f8fae505
...@@ -21,6 +21,7 @@ import java.util.Objects; ...@@ -21,6 +21,7 @@ import java.util.Objects;
@Singleton @Singleton
public class GroupDAO { public class GroupDAO {
@Inject
private MysqlConnect connect; private MysqlConnect connect;
@Inject @Inject
...@@ -28,28 +29,33 @@ public class GroupDAO { ...@@ -28,28 +29,33 @@ public class GroupDAO {
this.connect = connect; this.connect = connect;
} }
public ArrayList<String> getStudentsInSameGroupAs(StudentIdentifier student) { ArrayList<String> getStudentsInSameGroupAs(StudentIdentifier student) {
connect.connect(); connect.connect();
ArrayList<String> result = new ArrayList<>(); ArrayList<String> result = new ArrayList<>();
Integer groupId; int groupId= getGroupByStudent(student);
String mysqlRequest1 = "SELECT groupId FROM `groupuser` WHERE `projectName`=? AND `userEmail`=?"; String mysqlRequest = "SELECT * FROM `groupuser` WHERE `groupId`=?";
VereinfachtesResultSet vereinfachtesResultSet1 = VereinfachtesResultSet vereinfachtesResultSet = connect.issueSelectStatement(mysqlRequest, groupId);
connect.issueSelectStatement(mysqlRequest1, student.getProjectName(), student.getUserEmail()); boolean next2 = vereinfachtesResultSet.next();
vereinfachtesResultSet1.next();
groupId = vereinfachtesResultSet1.getInt("groupId");
String mysqlRequest2 = "SELECT * FROM `groupuser` WHERE `groupId`=?";
VereinfachtesResultSet vereinfachtesResultSet2 = connect.issueSelectStatement(mysqlRequest2, groupId);
boolean next2 = vereinfachtesResultSet2.next();
while (next2) { while (next2) {
String peer = vereinfachtesResultSet2.getString("userName"); String peer = vereinfachtesResultSet.getString("userEmail");
if (!peer.equals(student.getUserEmail())) if (!peer.equals(student.getUserEmail()))
result.add(peer); result.add(peer);
next2 = vereinfachtesResultSet2.next(); next2 = vereinfachtesResultSet.next();
} }
connect.close(); connect.close();
return result; 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) // refactor (you get the id as a return value when inserting into the db)
public void persist(Group group) { public void persist(Group group) {
......
gemeinsamforschen/src/main/webapp/annotation/js/unstructuredRest.js
+ 2
− 2
View file @ f8fae505
...@@ -5,8 +5,8 @@ ...@@ -5,8 +5,8 @@
* @param responseHandler The response handler * @param responseHandler The response handler
*/ */
function createFullSubmission(fullSubmissionPostRequest, responseHandler) { function createFullSubmission(fullSubmissionPostRequest, responseHandler) {
var url = "../rest/submissions/full"; let url = "../rest/submissions/full";
var json = JSON.stringify(fullSubmissionPostRequest); let json = JSON.stringify(fullSubmissionPostRequest);
$.ajax({ $.ajax({
url: url, url: url,
type: "POST", type: "POST",
......
gemeinsamforschen/src/main/webapp/annotation/js/unstructuredUpload.js
+ 3
− 3
View file @ f8fae505
...@@ -11,10 +11,10 @@ $(document).ready(function () { ...@@ -11,10 +11,10 @@ $(document).ready(function () {
let text = $('#upload-textarea').val(); let text = $('#upload-textarea').val();
// build request // build request
var fullSubmissionPostRequest = { let fullSubmissionPostRequest = {
user: user, user: user,
text: text, text: text,
projectName: getQueryVariable("projectName") projectName: $('#projectName').text().trim()
}; };
// save request in database // save request in database
...@@ -23,7 +23,7 @@ $(document).ready(function () { ...@@ -23,7 +23,7 @@ $(document).ready(function () {
$('#upload-textarea').val(""); $('#upload-textarea').val("");
// jump to next page // 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;
}); });
} }
}); });
......
gemeinsamforschen/src/main/webapp/annotation/upload-unstructured-dossier.jsp
+ 20
− 28
View file @ f8fae505
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
<%@ taglib uri="../taglibs/gemeinsamForschen.tld" prefix="menu" %> <%@ taglib uri="../taglibs/gemeinsamForschen.tld" prefix="menu" %>
<%@ taglib uri="../taglibs/gemeinsamForschen.tld" prefix="headLine" %> <%@ taglib uri="../taglibs/gemeinsamForschen.tld" prefix="headLine" %>
<%@ taglib uri="../taglibs/gemeinsamForschen.tld" prefix="omniDependencies" %> <%@ taglib uri="../taglibs/gemeinsamForschen.tld" prefix="omniDependencies" %>
<%@ taglib uri="../taglibs/gemeinsamForschen.tld" prefix="footer" %>
<!DOCTYPE html> <!DOCTYPE html>
...@@ -27,37 +28,28 @@ ...@@ -27,37 +28,28 @@
<body> <body>
<menu:menu hierarchy="1"/> <menu:menu hierarchy="1"/>
<div id="wrapper"> <div class="col span_l_of_2"> <!-- col right-->
<div class="page-content-wrapper full-height"> <headLine:headLine/>
<div class="container-fluid full-height"> <form id="upload-textarea-form">
<div class="container-fluid-content"> <div class="form-group upload-text" id="documentText">
<div class="flex"> <label for="upload-textarea">Texteingabe</label>
<headLine:headLine/> <textarea class="upload-text-textarea form-control" placeholder="Text einfügen..."
</div> id="upload-textarea" name="uploadtextarea"></textarea>
<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> </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>
<footer:footer/>
</body> </body>
</html> </html>
gemeinsamforschen/src/main/webapp/assessment/assess-work.jsp
+ 90
− 290
View file @ f8fae505
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
<table> <table>
<tr> <tr>
<td id="yourContent"> <td id="yourContent">
<h1>Assessment for project1 </h1> <h1>Assessment</h1>
<!-- Vorschläge für Bewertungen: <!-- Vorschläge für Bewertungen:
++Verantwortungsbewusstsein ++Verantwortungsbewusstsein
...@@ -50,299 +50,99 @@ ...@@ -50,299 +50,99 @@
</div> </div>
<div class="carousel-inner" id="peerTable"> <div class="carousel-inner" id="peerTable">
<!--<div class="item active"> <script id="peerTemplate" type="text/x-jQuery-tmpl">
<table class="table-striped peerStudent" {{if first}}
style="width:70%;border:1px solid; margin:auto;" id="Student1"> <div class="item active">
<tr> {{else}}
<td align="center"> <div class="item">
<img src="../assets/img/1.jpg" alt="student1" {{/if}}
style="width:20%;"> <table class="table-striped peerStudent" id="${peerId}">
</td> <tr>
</tr> <td align="center">
<tr> <img src="../libs/img/noImg.png" alt="${peerId}" style="width:20%;">
<td align="center"> </td>
<h3>Verantwortungsbewusstsein</h3> </tr>
</td> <tr>
</tr> <td align="center">
<tr> <h3>Verantwortungsbewusstsein</h3>
<td align="center"> </td>
<label>stark ausgeprägt<input type="radio" value="5" </tr>
name="responsibilityStudent1"></label> <tr>
<input type="radio" value="4" name="responsibilityStudent1"> <td align="center">
<input type="radio" value="3" name="responsibilityStudent1"> <label>stark ausgeprägt<input type="radio" value="5" name="responsibility${peerId}"></label>
<input type="radio" value="2" name="responsibilityStudent1"> <input type="radio" value="4" name="responsibility${peerId}">
<label><input type="radio" value="1" name="responsibilityStudent1"> <input type="radio" value="3" name="responsibility${peerId}">
ungenügend</label> <input type="radio" value="2" name="responsibility${peerId}">
</td> <label><input type="radio" value="1" name="responsibility${peerId}">ungenügend</label>
</tr> </td>
<tr> </tr>
<td align="center"> <tr>
<h3>Anteil am Produkt</h3> <td align="center">
</td> <h3>Anteil am Produkt</h3>
</tr> </td>
<tr> </tr>
<td align="center"> <tr>
<label>großer Anteil<input type="radio" value="5" <td align="center">
name="partOfWorkStudent1"></label> <label>großer Anteil<input type="radio" value="5" name="partOfWork${peerId}"></label>
<input type="radio" value="4" name="partOfWorkStudent1"> <input type="radio" value="4" name="partOfWork${peerId}">
<input type="radio" value="3" name="partOfWorkStudent1"> <input type="radio" value="3" name="partOfWork${peerId}">
<input type="radio" value="2" name="partOfWorkStudent1"> <input type="radio" value="2" name="partOfWork${peerId}">
<label><input type="radio" value="1" name="partOfWorkStudent1"> <label><input type="radio" value="1" name="partOfWork${peerId}">geringer Anteil</label>
geringer Anteil</label> </td>
</td> </tr>
</tr> <tr>
<tr> <td align="center">
<td align="center"> <h3>Kooperationsbereitschaft</h3>
<h3>Kooperationsbereitschaft</h3> </td>
</td> </tr>
</tr> <tr>
<tr> <td align="center">
<td align="center"> <label>sehr kooperativ<input type="radio" value="5" name="cooperation${peerId}">
<label>sehr kooperativ<input type="radio" value="5" name="cooperationStudent1"> </label>
</label> <input type="radio" value="4" name="cooperation${peerId}">
<input type="radio" value="4" name="cooperationStudent1"> <input type="radio" value="3" name="cooperation${peerId}">
<input type="radio" value="3" name="cooperationStudent1"> <input type="radio" value="2" name="cooperation${peerId}">
<input type="radio" value="2" name="cooperationStudent1"> <label><input type="radio" value="1" name="cooperation${peerId}">nicht kooperativ</label>
<label><input type="radio" value="1" name="cooperationStudent1"> </td>
nicht kooperativ</label> </tr>
</td> <tr>
</tr> <td align="center">
<tr> <h3>Disskusionsfähigkeit</h3>
<td align="center"> </td>
<h3>Disskusionsfähigkeit</h3> </tr>
</td> <tr>
</tr> <td align="center">
<tr> <label>gut kommuniziert und Meinung vertreten<input type="radio" value="5" name="communication${peerId}">
<td align="center"> </label>
<label>gut kommuniziert und Meinung vertreten<input type="radio" value="5" name="communicationStudent1"> <input type="radio" value="4" name="communication${peerId}">
</label> <input type="radio" value="3" name="communication${peerId}">
<input type="radio" value="4" name="communicationStudent1"> <input type="radio" value="2" name="communication${peerId}">
<input type="radio" value="3" name="communicationStudent1"> <label><input type="radio" value="1" name="communication${peerId}">keine Meinung und schlecht kommuniziert</label>
<input type="radio" value="2" name="communicationStudent1"> </td>
<label><input type="radio" value="1" name="communicationStudent1"> </tr>
keine Meinung und schlecht kommuniziert</label> <tr>
</td> <td align="center">
</tr> <h3>Selbstständigkeit</h3>
<tr> </td>
<td align="center"> </tr>
<h3>Selbstständigkeit</h3> <tr>
</td> <td align="center">
</tr> <label>selbstständig<input type="radio" value="5" name="autonomous${peerId}">
<tr> </label>
<td align="center"> <input type="radio" value="4" name="autonomous${peerId}">
<label>selbstständig<input type="radio" value="5" name="autonomousStudent1"> <input type="radio" value="3" name="autonomous${peerId}">
</label> <input type="radio" value="2" name="autonomous${peerId}">
<input type="radio" value="4" name="autonomousStudent1"> <label><input type="radio" value="1" name="autonomous${peerId}">abhängig</label>
<input type="radio" value="3" name="autonomousStudent1"> </td>
<input type="radio" value="2" name="autonomousStudent1"> </tr>
<label><input type="radio" value="1" name="autonomousStudent1">
abhängig</label>
</td>
</tr>
</table> </table>
<div align="center"> <div align="center">
<button class="btn btn-primary" id="btnJournalStudent1" >zeige Lernzieltagebuch</button> <button class="btn btn-primary" id="btnJournal${peerId}">
<div id="eJournalStudent1"> zeige Lernzieltagebuch</button>
Fasel Blubba Bla <div id="eJournal${peerId}">Fasel Blubba Bla</div>
</div>
</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>
</div>--> </script>
</div> </div>
<!-- Left and right controls --> <!-- Left and right controls -->
......
gemeinsamforschen/src/main/webapp/assessment/js/assess-work.js
+ 10
− 95
View file @ f8fae505
...@@ -27,101 +27,16 @@ function buildTablesForPeers() { ...@@ -27,101 +27,16 @@ function buildTablesForPeers() {
success: function (peers) { success: function (peers) {
let div = document.getElementById('peerTable'); let div = document.getElementById('peerTable');
for (let peer = 0; peer < peers.length; peer++) { for (let peer = 0; peer < peers.length; peer++) {
let tablePeer = document.createElement('DIV'); let peerId = peers[peer].replace("@","").replace(".","");
if (peer === 0) { let tmplObject={
tablePeer.className = "item active"; peerId: peerId,
} else { first: null
tablePeer.className = "item"; };
} if (peer===0)
let innerPeerTable = '<table class="table-striped peerStudent" id="' + peers[peer] + '">' + tmplObject.first=1;
'<tr>' + $('#peerTemplate').tmpl(tmplObject).appendTo(div);
'<td align="center">' + $('#btnJournal' +peerId).on("click", function () {
'<img src="../assets/img/noImg.png" alt="' + peers[peer] + '" style="width:20%;">' + $('#eJournal' +peerId).toggle();
'</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();
}); });
} }
}, },
......
gemeinsamforschen/src/main/webapp/project/tasks-student.jsp
+ 0
− 127
View file @ f8fae505
...@@ -55,133 +55,6 @@ ...@@ -55,133 +55,6 @@
</script> </script>
</div> </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>&nbsp;
<i class="fas fa-check-circle"></i>&nbsp;
<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/> <footer:footer/>
</body> </body>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment