Skip to content
Snippets Groups Projects
Commit 8dc3cf6e authored by Christian's avatar Christian
Browse files

feat. Eintragung der Dozent-Noten greift großteil der Daten dynamisch ab 

fix. DB-Anbindung korrigiert, wo noch fehlerhaft
fix. taglibs eingebunden (funktionieren)
parent 4e7cacf0
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 289 additions and 82 deletions
gemeinsamforschen/src/main/java/unipotsdam/gf/modules/assessment/controller/model/Assessment.java
+ 1
− 1
View file @ 8dc3cf6e
...@@ -105,7 +105,7 @@ public class Assessment { ...@@ -105,7 +105,7 @@ public class Assessment {
public void setAssessment(Assessment assessment) { public void setAssessment(Assessment assessment) {
MysqlConnect connect = new MysqlConnect(); MysqlConnect connect = new MysqlConnect();
connect.connect(); connect.connect();
String mysqlRequest = "INSERT INTO assessments ( `Adressat`, `Deadline`, `ErstellerId`,`EmpfängerId`, `ProjektId`, `Bewertung`) values (?,?,?,?,?,?)"; String mysqlRequest = "INSERT INTO assessments ( `adressat`, `deadline`, `erstellerId`,`empfaengerId`, `projektId`, `bewertung`) values (?,?,?,?,?,?)";
connect.issueInsertOrDeleteStatement(mysqlRequest, connect.issueInsertOrDeleteStatement(mysqlRequest,
assessment.isAdressat(), assessment.isAdressat(),
assessment.getDeadline(), assessment.getDeadline(),
......
gemeinsamforschen/src/main/java/unipotsdam/gf/modules/assessment/controller/view/AssessmentView.java
+ 45
− 5
View file @ 8dc3cf6e
package unipotsdam.gf.modules.assessment.controller.view; package unipotsdam.gf.modules.assessment.controller.view;
import unipotsdam.gf.core.management.user.User;
import unipotsdam.gf.interfaces.IPeerAssessment; import unipotsdam.gf.interfaces.IPeerAssessment;
import unipotsdam.gf.modules.assessment.controller.model.Assessment; import unipotsdam.gf.modules.assessment.controller.model.Assessment;
import unipotsdam.gf.modules.assessment.controller.model.*; import unipotsdam.gf.modules.assessment.controller.model.*;
import unipotsdam.gf.modules.assessment.controller.service.PeerAssessment;
import unipotsdam.gf.modules.assessment.controller.service.PeerAssessmentDummy; import unipotsdam.gf.modules.assessment.controller.service.PeerAssessmentDummy;
import javax.annotation.PostConstruct;
import javax.ws.rs.*; import javax.ws.rs.*;
import javax.ws.rs.core.MediaType; import javax.ws.rs.core.MediaType;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Date;
import java.util.List; import java.util.List;
import java.util.Map;
@Path("/assessments2") @Path("/assessments2")
public class AssessmentView implements IPeerAssessment{ public class AssessmentView implements IPeerAssessment{
...@@ -23,7 +20,7 @@ public class AssessmentView implements IPeerAssessment{ ...@@ -23,7 +20,7 @@ public class AssessmentView implements IPeerAssessment{
@Produces(MediaType.APPLICATION_JSON) @Produces(MediaType.APPLICATION_JSON)
@Path("/calculate3") @Path("/calculate3")
@Override @Override
public List<Grading> calculateAssessment(ArrayList<Performance> totalPerformance) { public Map<StudentIdentifier, Double> calculateAssessment(ArrayList<Performance> totalPerformance) {
return peer.calculateAssessment(totalPerformance); return peer.calculateAssessment(totalPerformance);
} }
...@@ -37,6 +34,11 @@ public class AssessmentView implements IPeerAssessment{ ...@@ -37,6 +34,11 @@ public class AssessmentView implements IPeerAssessment{
shuttle.setAssessment(assessment); //inhalte werden in die DB geschrieben und es wird erfolg zurückgemeldet shuttle.setAssessment(assessment); //inhalte werden in die DB geschrieben und es wird erfolg zurückgemeldet
return "1"; return "1";
} }
/*} /*}
@GET @GET
@Consumes(MediaType.APPLICATION_JSON) @Consumes(MediaType.APPLICATION_JSON)
...@@ -57,7 +59,13 @@ public class AssessmentView implements IPeerAssessment{ ...@@ -57,7 +59,13 @@ public class AssessmentView implements IPeerAssessment{
@Override @Override
public void addAssessmentDataToDB(Assessment assessment) { public void addAssessmentDataToDB(Assessment assessment) {
} }
@Override @Override
public Quiz getQuiz(String projectId, String groupId, String author) {
return null;
}
public Quiz getQuiz(String projectId, String groupId) { public Quiz getQuiz(String projectId, String groupId) {
return null; return null;
} }
...@@ -72,7 +80,13 @@ public class AssessmentView implements IPeerAssessment{ ...@@ -72,7 +80,13 @@ public class AssessmentView implements IPeerAssessment{
public ArrayList<Performance> getTotalAssessment(StudentIdentifier studentIdentifier) { public ArrayList<Performance> getTotalAssessment(StudentIdentifier studentIdentifier) {
return null; return null;
} }
@Override @Override
public int meanOfAssessment(String ProjectId) {
return 0;
}
public int meanOfAssessement(String ProjectId) { public int meanOfAssessement(String ProjectId) {
return 0; return 0;
} }
...@@ -80,7 +94,33 @@ public class AssessmentView implements IPeerAssessment{ ...@@ -80,7 +94,33 @@ public class AssessmentView implements IPeerAssessment{
public ArrayList<Quiz> getQuiz(String projectId) { public ArrayList<Quiz> getQuiz(String projectId) {
return null; return null;
} }
@Override
public void postPeerRating(ArrayList<PeerRating> peerRatings, String projectId) {
}
@Override
public void postContributionRating(StudentIdentifier student, String fromPeer, Map<String, Integer> contributionRating) {
}
@Override
public void answerQuiz(Map<String, List<String>> questions, StudentIdentifier student) {
}
@Override
public void deleteQuiz(String quizId) {
}
@Override @Override
public Map<StudentIdentifier, Double> calculateAssessment(String projectId, String method) {
return null;
}
public void postPeerRating(ArrayList<PeerRating> peerRatings, String projectId, String groupId) { public void postPeerRating(ArrayList<PeerRating> peerRatings, String projectId, String groupId) {
} }
} }
gemeinsamforschen/src/main/webapp/assets/js/AlertAssessmentOutlier.js
+ 227
− 56
View file @ 8dc3cf6e
...@@ -9,20 +9,23 @@ $(document).ready(function () { ...@@ -9,20 +9,23 @@ $(document).ready(function () {
document.getElementById("demo").innerHTML="verlauf"; document.getElementById("demo").innerHTML="verlauf";
}); });
}); });
// hier noch dynamik ergänzen, damit der Student und die Gruppe ausgelesen werden
$(document).ready(function () { $(document).ready(function () {
$('#ProblemGrp1').on('click',function () { $('#ProblemGrp1').on('click',function () {
var alarm = prompt("hier gibt es Unstimmigeiten","Vorgeschlagene Note:") var alarm = prompt("hier gibt es Unstimmigeiten","Vorgeschlagene Note:")
if (alarm === "1"||alarm=="2"||alarm=="3"||alarm=="4"||alarm=="5"||alarm=="6") { if (alarm === "1"||alarm=="2"||alarm=="3"||alarm=="4"||alarm=="5"||alarm=="6") {
var dataP= JSON.stringify({"adressat":true,"student": { var dataP= JSON.stringify({"adressat":true,"student": {
"projectId": "projekt2", "projectId": getQueryVariable("projectId"),
"studentId": "fgnxnw" "studentId": "fgnxnw"
}, "deadline":new Date(), }, "deadline":new Date(),
"bewertender": { "bewertender": {
"projectId": "projekt2", "projectId": getQueryVariable("projectId"),
"studentId": "christians" "studentId": document.getElementById("user").innerText
}, },
"projektId":"projekt2", "projektId":getQueryVariable("projectId"),
"bewertung":alarm "bewertung":alarm
}); });
$.ajax({ $.ajax({
...@@ -51,7 +54,33 @@ $(document).ready(function () { ...@@ -51,7 +54,33 @@ $(document).ready(function () {
$('#ProblemGrp1S1').on('click',function () { $('#ProblemGrp1S1').on('click',function () {
var alarm = prompt("hier gibt es Unstimmigeiten","Vorgeschlagene Note:") var alarm = prompt("hier gibt es Unstimmigeiten","Vorgeschlagene Note:")
if (alarm === "1"||alarm=="2"||alarm=="3"||alarm=="4"||alarm=="5"||alarm=="6") { if (alarm === "1"||alarm=="2"||alarm=="3"||alarm=="4"||alarm=="5"||alarm=="6") {
document.getElementById("ProblemGrp1S1").innerHTML = alarm;
var dataP= JSON.stringify({"adressat":true,"student": {
"projectId": getQueryVariable("projectId"),
"studentId": "fgnxnw"
}, "deadline":new Date(),
"bewertender": {
"projectId": getQueryVariable("projectId"),
"studentId": document.getElementById("user").innerText
},
"projektId":getQueryVariable("projectId"),
"bewertung":alarm
});
$.ajax({
url: "../rest/assessments2/calculate2",
type: 'POST',
headers: {
"Content-Type": "application/json",
"Cache-Control": "no-cache"
},
data: dataP,
success: function (response) {
document.getElementById('ProblemGrp1S1').innerHTML=response;
},
error: function (a,b,c) {
alert('some error' + b);
}
})
} }
else{ else{
window.alert("Bitte eine Zahl zwischen eins und 6 angeben") window.alert("Bitte eine Zahl zwischen eins und 6 angeben")
...@@ -62,7 +91,33 @@ $(document).ready(function () { ...@@ -62,7 +91,33 @@ $(document).ready(function () {
$('#ProblemGrp1S2').on('click',function () { $('#ProblemGrp1S2').on('click',function () {
var alarm = prompt("hier gibt es Unstimmigeiten","Vorgeschlagene Note:") var alarm = prompt("hier gibt es Unstimmigeiten","Vorgeschlagene Note:")
if (alarm === "1"||alarm=="2"||alarm=="3"||alarm=="4"||alarm=="5"||alarm=="6") { if (alarm === "1"||alarm=="2"||alarm=="3"||alarm=="4"||alarm=="5"||alarm=="6") {
document.getElementById("ProblemGrp1S2").innerHTML = alarm;
var dataP= JSON.stringify({"adressat":true,"student": {
"projectId": getQueryVariable("projectId"),
"studentId": "fgnxnw"
}, "deadline":new Date(),
"bewertender": {
"projectId": getQueryVariable("projectId"),
"studentId": document.getElementById("user").innerText
},
"projektId":getQueryVariable("projectId"),
"bewertung":alarm
});
$.ajax({
url: "../rest/assessments2/calculate2",
type: 'POST',
headers: {
"Content-Type": "application/json",
"Cache-Control": "no-cache"
},
data: dataP,
success: function (response) {
document.getElementById('ProblemGrp1S2').innerHTML=response;
},
error: function (a,b,c) {
alert('some error' + b);
}
})
} }
else{ else{
window.alert("Bitte eine Zahl zwischen eins und 6 angeben") window.alert("Bitte eine Zahl zwischen eins und 6 angeben")
...@@ -73,7 +128,33 @@ $(document).ready(function () { ...@@ -73,7 +128,33 @@ $(document).ready(function () {
$('#ProblemGrp2').on('click',function () { $('#ProblemGrp2').on('click',function () {
var alarm = prompt("hier gibt es Unstimmigeiten","Vorgeschlagene Note:") var alarm = prompt("hier gibt es Unstimmigeiten","Vorgeschlagene Note:")
if (alarm === "1"||alarm=="2"||alarm=="3"||alarm=="4"||alarm=="5"||alarm=="6") { if (alarm === "1"||alarm=="2"||alarm=="3"||alarm=="4"||alarm=="5"||alarm=="6") {
document.getElementById("ProblemGrp2").innerHTML = alarm;
var dataP= JSON.stringify({"adressat":true,"student": {
"projectId": getQueryVariable("projectId"),
"studentId": "fgnxnw"
}, "deadline":new Date(),
"bewertender": {
"projectId": getQueryVariable("projectId"),
"studentId": document.getElementById("user").innerText
},
"projektId":getQueryVariable("projectId"),
"bewertung":alarm
});
$.ajax({
url: "../rest/assessments2/calculate2",
type: 'POST',
headers: {
"Content-Type": "application/json",
"Cache-Control": "no-cache"
},
data: dataP,
success: function (response) {
document.getElementById('ProblemGrp2').innerHTML=response;
},
error: function (a,b,c) {
alert('some error' + b);
}
})
} }
else{ else{
window.alert("Bitte eine Zahl zwischen eins und 6 angeben") window.alert("Bitte eine Zahl zwischen eins und 6 angeben")
...@@ -84,7 +165,33 @@ $(document).ready(function () { ...@@ -84,7 +165,33 @@ $(document).ready(function () {
$('#ProblemGrp2S3').on('click',function () { $('#ProblemGrp2S3').on('click',function () {
var alarm = prompt("hier gibt es Unstimmigeiten","Vorgeschlagene Note:") var alarm = prompt("hier gibt es Unstimmigeiten","Vorgeschlagene Note:")
if (alarm === "1"||alarm=="2"||alarm=="3"||alarm=="4"||alarm=="5"||alarm=="6") { if (alarm === "1"||alarm=="2"||alarm=="3"||alarm=="4"||alarm=="5"||alarm=="6") {
document.getElementById("ProblemGrp2S3").innerHTML = alarm;
var dataP= JSON.stringify({"adressat":true,"student": {
"projectId": getQueryVariable("projectId"),
"studentId": "fgnxnw"
}, "deadline":new Date(),
"bewertender": {
"projectId": getQueryVariable("projectId"),
"studentId": document.getElementById("user").innerText
},
"projektId":getQueryVariable("projectId"),
"bewertung":alarm
});
$.ajax({
url: "../rest/assessments2/calculate2",
type: 'POST',
headers: {
"Content-Type": "application/json",
"Cache-Control": "no-cache"
},
data: dataP,
success: function (response) {
document.getElementById('ProblemGrp2S3').innerHTML=response;
},
error: function (a,b,c) {
alert('some error' + b);
}
})
} }
else{ else{
window.alert("Bitte eine Zahl zwischen eins und 6 angeben") window.alert("Bitte eine Zahl zwischen eins und 6 angeben")
...@@ -94,18 +201,34 @@ $(document).ready(function () { ...@@ -94,18 +201,34 @@ $(document).ready(function () {
$(document).ready(function () { $(document).ready(function () {
$('#ProblemGrp2S4').on('click',function () { $('#ProblemGrp2S4').on('click',function () {
var alarm = prompt("hier gibt es Unstimmigeiten","Vorgeschlagene Note:") var alarm = prompt("hier gibt es Unstimmigeiten","Vorgeschlagene Note:")
if (alarm === "1") { if (alarm === "1"||alarm=="2"||alarm=="3"||alarm=="4"||alarm=="5"||alarm=="6") {
document.getElementById("demo").innerHTML = alarm;
} else if (alarm === "2") { var dataP= JSON.stringify({"adressat":true,"student": {
document.getElementById("demo").innerHTML = alarm; "projectId": getQueryVariable("projectId"),
} else if (alarm === "3") { "studentId": "fgnxnw"
document.getElementById("demo").innerHTML = alarm; }, "deadline":new Date(),
} else if (alarm === "4") { "bewertender": {
document.getElementById("demo").innerHTML = alarm; "projectId": getQueryVariable("projectId"),
} else if (alarm === "5") { "studentId": document.getElementById("user").innerText
document.getElementById("demo").innerHTML = alarm; },
} else if (alarm === "6") { "projektId":getQueryVariable("projectId"),
document.getElementById("demo").innerHTML = alarm; "bewertung":alarm
});
$.ajax({
url: "../rest/assessments2/calculate2",
type: 'POST',
headers: {
"Content-Type": "application/json",
"Cache-Control": "no-cache"
},
data: dataP,
success: function (response) {
document.getElementById('ProblemGrp2S4').innerHTML=response;
},
error: function (a,b,c) {
alert('some error' + b);
}
})
} }
else{ else{
window.alert("Bitte eine Zahl zwischen eins und 6 angeben") window.alert("Bitte eine Zahl zwischen eins und 6 angeben")
...@@ -115,18 +238,34 @@ $(document).ready(function () { ...@@ -115,18 +238,34 @@ $(document).ready(function () {
$(document).ready(function () { $(document).ready(function () {
$('#ProblemGrp3').on('click',function () { $('#ProblemGrp3').on('click',function () {
var alarm = prompt("hier gibt es Unstimmigeiten","Vorgeschlagene Note:") var alarm = prompt("hier gibt es Unstimmigeiten","Vorgeschlagene Note:")
if (alarm === "1") { if (alarm === "1"||alarm=="2"||alarm=="3"||alarm=="4"||alarm=="5"||alarm=="6") {
document.getElementById("demo").innerHTML = alarm;
} else if (alarm === "2") { var dataP= JSON.stringify({"adressat":true,"student": {
document.getElementById("demo").innerHTML = alarm; "projectId": getQueryVariable("projectId"),
} else if (alarm === "3") { "studentId": "fgnxnw"
document.getElementById("demo").innerHTML = alarm; }, "deadline":new Date(),
} else if (alarm === "4") { "bewertender": {
document.getElementById("demo").innerHTML = alarm; "projectId": getQueryVariable("projectId"),
} else if (alarm === "5") { "studentId": document.getElementById("user").innerText
document.getElementById("demo").innerHTML = alarm; },
} else if (alarm === "6") { "projektId":getQueryVariable("projectId"),
document.getElementById("demo").innerHTML = alarm; "bewertung":alarm
});
$.ajax({
url: "../rest/assessments2/calculate2",
type: 'POST',
headers: {
"Content-Type": "application/json",
"Cache-Control": "no-cache"
},
data: dataP,
success: function (response) {
document.getElementById('ProblemGrp3').innerHTML=response;
},
error: function (a,b,c) {
alert('some error' + b);
}
})
} }
else{ else{
window.alert("Bitte eine Zahl zwischen eins und 6 angeben") window.alert("Bitte eine Zahl zwischen eins und 6 angeben")
...@@ -136,18 +275,34 @@ $(document).ready(function () { ...@@ -136,18 +275,34 @@ $(document).ready(function () {
$(document).ready(function () { $(document).ready(function () {
$('#ProblemGrp3S5').on('click',function () { $('#ProblemGrp3S5').on('click',function () {
var alarm = prompt("hier gibt es Unstimmigeiten","Vorgeschlagene Note:") var alarm = prompt("hier gibt es Unstimmigeiten","Vorgeschlagene Note:")
if (alarm === "1") { if (alarm === "1"||alarm=="2"||alarm=="3"||alarm=="4"||alarm=="5"||alarm=="6") {
document.getElementById("demo").innerHTML = alarm;
} else if (alarm === "2") { var dataP= JSON.stringify({"adressat":true,"student": {
document.getElementById("demo").innerHTML = alarm; "projectId": getQueryVariable("projectId"),
} else if (alarm === "3") { "studentId": "fgnxnw"
document.getElementById("demo").innerHTML = alarm; }, "deadline":new Date(),
} else if (alarm === "4") { "bewertender": {
document.getElementById("demo").innerHTML = alarm; "projectId": getQueryVariable("projectId"),
} else if (alarm === "5") { "studentId": document.getElementById("user").innerText
document.getElementById("demo").innerHTML = alarm; },
} else if (alarm === "6") { "projektId":getQueryVariable("projectId"),
document.getElementById("demo").innerHTML = alarm; "bewertung":alarm
});
$.ajax({
url: "../rest/assessments2/calculate2",
type: 'POST',
headers: {
"Content-Type": "application/json",
"Cache-Control": "no-cache"
},
data: dataP,
success: function (response) {
document.getElementById('ProblemGrp3S5').innerHTML=response;
},
error: function (a,b,c) {
alert('some error' + b);
}
})
} }
else{ else{
window.alert("Bitte eine Zahl zwischen eins und 6 angeben") window.alert("Bitte eine Zahl zwischen eins und 6 angeben")
...@@ -157,18 +312,34 @@ $(document).ready(function () { ...@@ -157,18 +312,34 @@ $(document).ready(function () {
$(document).ready(function () { $(document).ready(function () {
$('#ProblemGrp3S6').on('click',function () { $('#ProblemGrp3S6').on('click',function () {
var alarm = prompt("hier gibt es Unstimmigeiten","Vorgeschlagene Note:") var alarm = prompt("hier gibt es Unstimmigeiten","Vorgeschlagene Note:")
if (alarm === "1") { if (alarm === "1"||alarm=="2"||alarm=="3"||alarm=="4"||alarm=="5"||alarm=="6") {
document.getElementById("demo").innerHTML = alarm;
} else if (alarm === "2") { var dataP= JSON.stringify({"adressat":true,"student": {
document.getElementById("demo").innerHTML = alarm; "projectId": getQueryVariable("projectId"),
} else if (alarm === "3") { "studentId": "fgnxnw"
document.getElementById("demo").innerHTML = alarm; }, "deadline":new Date(),
} else if (alarm === "4") { "bewertender": {
document.getElementById("demo").innerHTML = alarm; "projectId": getQueryVariable("projectId"),
} else if (alarm === "5") { "studentId": document.getElementById("user").innerText
document.getElementById("demo").innerHTML = alarm; },
} else if (alarm === "6") { "projektId":getQueryVariable("projectId"),
document.getElementById("demo").innerHTML = alarm; "bewertung":alarm
});
$.ajax({
url: "../rest/assessments2/calculate2",
type: 'POST',
headers: {
"Content-Type": "application/json",
"Cache-Control": "no-cache"
},
data: dataP,
success: function (response) {
document.getElementById('ProblemGrp3S6').innerHTML=response;
},
error: function (a,b,c) {
alert('some error' + b);
}
})
} }
else{ else{
window.alert("Bitte eine Zahl zwischen eins und 6 angeben") window.alert("Bitte eine Zahl zwischen eins und 6 angeben")
......
gemeinsamforschen/src/main/webapp/assets/js/overview-docent.js
+ 2
− 2
View file @ 8dc3cf6e
$(document).ready(function(){ $(document).ready(function(){
$('#project1Link').on('click', function(){ $('#project1Link').on('click', function(){
window.location.href="project-docent_CG.jsp?token="+getUserTokenFromUrl(); window.location.href="project-docent_CG.jsp?token="+getUserTokenFromUrl();
location.href="project-docent.jsp?token="+getUserTokenFromUrl()+'&projectId='+'gemeinsamForschen'; location.href="project-docent_CG.jsp?token="+getUserTokenFromUrl()+'&projectId='+'gemeinsamForschen';
}); });
$('#project2Link').on('click', function(){ $('#project2Link').on('click', function(){
window.location.href="project-docent_CG.jsp?token="+getUserTokenFromUrl(); window.location.href="project-docent_CG.jsp?token="+getUserTokenFromUrl();
location.href="project-docent.jsp?token="+getUserTokenFromUrl()+'&projectId='+'Kaleo'; location.href="project-docent_CG.jsp?token="+getUserTokenFromUrl()+'&projectId='+'Kaleo';
}); });
$('#createProject').on('click', function(){ $('#createProject').on('click', function(){
location.href="createProject.jsp?token="+getUserTokenFromUrl(); location.href="createProject.jsp?token="+getUserTokenFromUrl();
......
gemeinsamforschen/src/main/webapp/assets/js/utility.js
+ 1
− 0
View file @ 8dc3cf6e
...@@ -24,3 +24,4 @@ function getQueryVariable(variable) { ...@@ -24,3 +24,4 @@ function getQueryVariable(variable) {
} }
return (false); return (false);
} }
gemeinsamforschen/src/main/webapp/pages/project-docent_CG.jsp
+ 13
− 17
View file @ 8dc3cf6e
<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> <%@ page contentType="text/html;charset=UTF-8" language="java" %>
<%@ taglib prefix = "communication" uri = "/communication/chatWindow.tld"%> <%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="menu" %>
<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="menu"%> <%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="headLine" %>
<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="omniDependencies" %>
<!DOCTYPE html> <!DOCTYPE html>
<html> <html>
<head> <head>
<meta charset="utf-8"> <omniDependencies:omniDependencies/>
<meta name="viewport" content="width=device-width, initial-scale=1.0"> <script src="../assets/js/utility.js"></script>
<title>fltrail</title>
<link rel="stylesheet" href="../assets/css/styles.css">
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css">
<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.3.1/jquery.min.js"></script>
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js"></script>
<script src="../assets/js/AlertAssessmentOutlier.js"></script> <script src="../assets/js/AlertAssessmentOutlier.js"></script>
<script src="../assets/js/grading.js"></script> <script src="../assets/js/grading.js"></script>
<link rel="stylesheet" href="../assets/fonts/font-awesome.min.css">
<link rel="stylesheet" href="../assets/css/Community-ChatComments.css">
<link rel="stylesheet" href="../assets/css/Sidebar-Menu-1.css">
<link rel="stylesheet" href="../assets/css/Sidebar-Menu.css">
<script src="../assets/js/utility.js"></script>
</head> </head>
<body> <body>
<div id="wrapper"> <div id="wrapper">
<menu:menu></menu:menu> <menu:menu></menu:menu>
<div class="page-content-wrapper"> <div class="page-content-wrapper">
<div class="container-fluid"> <div class="container-fluid">
<h1 id="headline">dummy Projekt1 für Dozent1</h1><button class="btn btn-default" type="button">Gruppen erstellen</button><button class="btn btn-default" type="button" id="ProjektFinalisieren">Projekt finalisieren</button><button class="btn btn-default" type="button">Exportiere Projektergebnisse</button> <headLine:headLine/>
<button class="btn btn-default" type="button">Gruppen erstellen</button>
<button class="btn btn-default" type="button" id="ProjektFinalisieren">Projekt finalisieren</button>
<button class="btn btn-default" type="button">Exportiere Projektergebnisse</button>
</div> </div>
<p hidden id="ProjektId">Projekt1</p> <p hidden id="ProjektId">Projekt1</p>
<button <button
......
gemeinsamforschen/src/test/java/unipotsdam/gf/modules/assessment/TestAddAssessment.java
+ 0
− 1
View file @ 8dc3cf6e
...@@ -46,7 +46,6 @@ public class TestAddAssessment { ...@@ -46,7 +46,6 @@ public class TestAddAssessment {
connect.connect(); connect.connect();
String mysqlRequest = "SELECT * FROM `assessments` WHERE `empfaengerId`=? AND `projektId`=?"; String mysqlRequest = "SELECT * FROM `assessments` WHERE `empfaengerId`=? AND `projektId`=?";
String test = "fgnxn"; String test = "fgnxn";
String test2 = "projekt"; String test2 = "projekt";
VereinfachtesResultSet ausgabe = connect.issueSelectStatement(mysqlRequest,test, test2); VereinfachtesResultSet ausgabe = connect.issueSelectStatement(mysqlRequest,test, test2);
......
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