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 f0596581579b62a00fe8d21b0e9e67e86ce96120..fdb646c34db9321929ffd62888cd49b742bec384 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 @@ -26,7 +26,7 @@ class AssessmentDBCommunication { boolean next = vereinfachtesResultSet.next(); while (next) { Map workRating = new HashMap(); - for (String category: Categories.workRatingCategories){ + for (String category : Categories.workRatingCategories) { workRating.put(category, (double) vereinfachtesResultSet.getInt(category)); } result.add(workRating); @@ -35,7 +35,7 @@ class AssessmentDBCommunication { return result; } - List<String> getStudents(String projectID){ + List<String> getStudents(String projectID) { List<String> result = new ArrayList<>(); MysqlConnect connect = new MysqlConnect(); connect.connect(); @@ -60,12 +60,13 @@ class AssessmentDBCommunication { boolean next = vereinfachtesResultSet.next(); while (next) { Map<String, Double> contributionRating = new HashMap<>(); - for (String category: Categories.contributionRatingCategories){ + for (String category : Categories.contributionRatingCategories) { contributionRating.put(category, (double) vereinfachtesResultSet.getInt(category)); } result.add(contributionRating); next = vereinfachtesResultSet.next(); } + connect.close(); return result; } @@ -81,6 +82,69 @@ class AssessmentDBCommunication { result.add(vereinfachtesResultSet.getInt("correct")); next = vereinfachtesResultSet.next(); } + connect.close(); return result; } + + void writeWorkRatingToDB(StudentIdentifier student, String fromStudent, Map<String, Integer> workRating) { + MysqlConnect connect = new MysqlConnect(); + connect.connect(); + String mysqlRequest = "INSERT INTO `workrating`(`projectId`, `studentId`, `fromPeer`, " + + "`responsibility`, " + + "`partOfWork`, " + + "`cooperation`, " + + "`communication`, " + + "`autonomous`" + + ") VALUES (?,?,?,?,?,?,?,?)"; + connect.issueSelectStatement(mysqlRequest, student.getProjectId(), student.getStudentId(), fromStudent, + workRating.get("responsibility"), + workRating.get("partOfWork"), + workRating.get("cooperation"), + workRating.get("communication"), + workRating.get("autonomous") + ); + connect.close(); + } + + void writeContributionRatingToDB(StudentIdentifier student, String fromStudent, Map<String, Integer> contributionRating) { + MysqlConnect connect = new MysqlConnect(); + connect.connect(); + String mysqlRequest = "INSERT INTO `contributionrating`(`studentID`, `projectID`, `fromStudentID`, " + + "`Dossier`, " + + "`eJournal`, " + + "`research`" + + ") VALUES (?,?,?,?,?,?)"; + connect.issueSelectStatement(mysqlRequest, student.getProjectId(), student.getStudentId(), fromStudent, + contributionRating.get("Dossier"), + contributionRating.get("eJournal"), + contributionRating.get("research") + ); + connect.close(); + } + + void writeGradesToDB(Grading grade) { + MysqlConnect connect = new MysqlConnect(); + connect.connect(); + String mysqlRequest = "INSERT INTO `grades`(`projectId`, `studentId`, `grade`) VALUES (?,?,?)"; + connect.issueSelectStatement(mysqlRequest, + grade.getStudentIdentifier().getProjectId(), + grade.getStudentIdentifier().getStudentId(), + grade.getGrade() + ); + connect.close(); + } + + void writeAnsweredQuiz(StudentIdentifier student, String question, Boolean correct) { + MysqlConnect connect = new MysqlConnect(); + connect.connect(); + String mysqlRequest = "INSERT INTO `answeredquiz`(`projectId`, `studentId`, `question`, `correct`) VALUES (?,?,?,?)"; + connect.issueSelectStatement(mysqlRequest, + student.getProjectId(), + student.getStudentId(), + question, + correct + ); + connect.close(); + } + } diff --git a/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/assessment/controller/service/QuizDBCommunication.java b/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/assessment/controller/service/QuizDBCommunication.java index a2aecdb7a9d6247fd2a7afa530ca79ffcfbdd016..1bec0a0672821a6f22d342f5dd1390d7340066ac 100644 --- a/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/assessment/controller/service/QuizDBCommunication.java +++ b/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/assessment/controller/service/QuizDBCommunication.java @@ -104,24 +104,21 @@ public class QuizDBCommunication { String mcType; String question; String answer; - boolean correct; ArrayList<String> correctAnswers = quiz.getCorrectAnswers(); for (String correctAnswer : correctAnswers) { answer = correctAnswer; mcType = quiz.getType(); question = quiz.getQuestion(); - correct = true; String mysqlRequest = "INSERT INTO `quiz`(`author`, `projectId`, `question`, `mcType`, `answer`, `correct`) VALUES (?,?,?,?,?,?)"; - connect.issueInsertOrDeleteStatement(mysqlRequest, author, projectId, question, mcType, answer, correct); + connect.issueInsertOrDeleteStatement(mysqlRequest, author, projectId, question, mcType, answer, true); } ArrayList<String> incorrectAnswers = quiz.getIncorrectAnswers(); for (String incorrectAnswer : incorrectAnswers) { answer = incorrectAnswer; mcType = quiz.getType(); question = quiz.getQuestion(); - correct = false; String mysqlRequest = "INSERT INTO `quiz`(`author`, `projectId`, `question`, `mcType`, `answer`, `correct`) VALUES (?,?,?,?,?,?)"; - connect.issueInsertOrDeleteStatement(mysqlRequest, author, projectId, question, mcType, answer, correct); + connect.issueInsertOrDeleteStatement(mysqlRequest, author, projectId, question, mcType, answer, false); } connect.close(); }