diff --git a/gemeinsamforschen/modellierung/activities_dehne.vsdx b/gemeinsamforschen/modellierung/activities_dehne.vsdx
deleted file mode 100644
index f9d4e20f40470655882636f8217cd0e13555cc52..0000000000000000000000000000000000000000
Binary files a/gemeinsamforschen/modellierung/activities_dehne.vsdx and /dev/null differ
diff --git a/gemeinsamforschen/src/main/java/unipotsdam/gf/config/GFApplicationBinder.java b/gemeinsamforschen/src/main/java/unipotsdam/gf/config/GFApplicationBinder.java
index c141eb81b34211d8fd34508714cd19e8fe2f4825..39435210174dcaa76363ad6c2183c443685b2c19 100644
--- a/gemeinsamforschen/src/main/java/unipotsdam/gf/config/GFApplicationBinder.java
+++ b/gemeinsamforschen/src/main/java/unipotsdam/gf/config/GFApplicationBinder.java
@@ -44,10 +44,7 @@ import unipotsdam.gf.modules.submission.controller.SubmissionController;
import unipotsdam.gf.modules.user.UserDAO;
import unipotsdam.gf.mysql.MysqlConnect;
import unipotsdam.gf.mysql.MysqlConnectImpl;
-import unipotsdam.gf.process.DossierCreationProcess;
-import unipotsdam.gf.process.GroupFormationProcess;
-import unipotsdam.gf.process.ProjectCreationProcess;
-import unipotsdam.gf.process.SurveyProcess;
+import unipotsdam.gf.process.*;
import unipotsdam.gf.process.constraints.ConstraintsImpl;
import unipotsdam.gf.process.phases.PhasesImpl;
import unipotsdam.gf.process.tasks.TaskDAO;
@@ -76,6 +73,7 @@ public class GFApplicationBinder extends AbstractBinder {
bind(EmailService.class).to(EmailService.class);
bind(ManagementImpl.class).to(Management.class);
bind(PeerAssessment.class).to(IPeerAssessment.class);
+ bind(PeerAssessmentProcess.class).to(PeerAssessmentProcess.class);
bind(PhasesImpl.class).to(IPhases.class);
bind(GFContext.class).to(GFContext.class);
bind(ManagementImpl.class).to(Management.class);
diff --git a/gemeinsamforschen/src/main/java/unipotsdam/gf/process/DossierCreationProcess.java b/gemeinsamforschen/src/main/java/unipotsdam/gf/process/DossierCreationProcess.java
index 21af87057852912dfa03a5f85c7c2e3ebcc728e3..361fee79bce80917697bb63d35fafdad053389cd 100644
--- a/gemeinsamforschen/src/main/java/unipotsdam/gf/process/DossierCreationProcess.java
+++ b/gemeinsamforschen/src/main/java/unipotsdam/gf/process/DossierCreationProcess.java
@@ -51,6 +51,7 @@ public class DossierCreationProcess {
@Inject
private GroupDAO groupDAO;
+
/**
* start the Dossier Phase
*
@@ -148,6 +149,13 @@ public class DossierCreationProcess {
iCommunication.sendMessageToUsers(project, Messages.NewFeedbackTask(project));
saveState(project, changeToPhase);
}*/
+
+ // add peer assessment tasks
+ // note that this should be moved to another process later on
+
+
+
+ //peerAssessmentProcess.startPeerAssessmentPhaseForTest(project);
}
public void createSeeFeedBackTask(Project project, Integer groupId) {
diff --git a/gemeinsamforschen/src/main/java/unipotsdam/gf/process/GroupFormationProcess.java b/gemeinsamforschen/src/main/java/unipotsdam/gf/process/GroupFormationProcess.java
index 6cb7a53efc34937feca832d5ae3ee9a3b1c03810..f8c5b0cd6863e49156557ca4499f445aea445d6c 100644
--- a/gemeinsamforschen/src/main/java/unipotsdam/gf/process/GroupFormationProcess.java
+++ b/gemeinsamforschen/src/main/java/unipotsdam/gf/process/GroupFormationProcess.java
@@ -13,8 +13,6 @@ import unipotsdam.gf.modules.group.GroupFormationMechanism;
import unipotsdam.gf.modules.group.preferences.database.ProfileDAO;
import unipotsdam.gf.modules.project.Project;
import unipotsdam.gf.modules.project.ProjectDAO;
-import unipotsdam.gf.modules.user.User;
-import unipotsdam.gf.modules.user.UserDAO;
import unipotsdam.gf.process.phases.Phase;
import unipotsdam.gf.process.tasks.Progress;
import unipotsdam.gf.process.tasks.Task;
@@ -47,6 +45,12 @@ public class GroupFormationProcess {
@Inject
private ICommunication iCommunication;
+
+ /**
+ * changes the group formation algorithm to the given.
+ * @param groupFormationMechanism
+ * @param project
+ */
public void setGroupFormationMechanism(GroupFormationMechanism groupFormationMechanism, Project project) {
projectDAO.setGroupFormationMechanism(groupFormationMechanism, project);
}
diff --git a/gemeinsamforschen/src/main/java/unipotsdam/gf/process/PeerAssessmentProcess.java b/gemeinsamforschen/src/main/java/unipotsdam/gf/process/PeerAssessmentProcess.java
index 3cb41d29e39bdc224608b609b8480627817bc542..de48a259a28be9c08b845696a1e0c2aca425a3cb 100644
--- a/gemeinsamforschen/src/main/java/unipotsdam/gf/process/PeerAssessmentProcess.java
+++ b/gemeinsamforschen/src/main/java/unipotsdam/gf/process/PeerAssessmentProcess.java
@@ -8,6 +8,8 @@ import unipotsdam.gf.process.tasks.*;
import javax.inject.Inject;
+import static unipotsdam.gf.process.tasks.TaskName.UPLOAD_PRESENTATION;
+
public class PeerAssessmentProcess {
@Inject
@@ -16,7 +18,20 @@ public class PeerAssessmentProcess {
@Inject
private UserDAO userDAO;
- public void start(Project project) {
+ /**
+ * this function is only used to show the peer assessment phase before previous phases are ready
+ * @param project
+ */
+ public void startPeerAssessmentPhaseForTest(Project project) {
+ //Task task = new Task(TaskName.UPLOAD_PRESENTATION, project, Progress.JUSTSTARTED);
+ taskDAO.persistTaskForAllGroups(project, UPLOAD_PRESENTATION, Phase.GroupFormation);
+ }
+
+ /**
+ * IF WE GET TO THE PEER ASSESSMENT PHASE NATURALLY (NOT VIA DIRECT LINK AFTER GROUP FORMATION)
+ * COMMENT THE FUNCTIONS IN THAT ARE NEEDED
+ */
+/* public void start(Project project) {
Task task = new Task(TaskName.CLOSE_EXECUTION_PHASE, project.getAuthorEmail(), project.getName(),
Progress.FINISHED);
taskDAO.updateForUser(task);
@@ -52,17 +67,17 @@ public class PeerAssessmentProcess {
taskDAO.updateForUser(task);
taskDAO.persist(taskDAO.createUserDefault(project, user, TaskName.END, Phase.Projectfinished));
//todo: implement communication stuff
- /* if (tasks.size() > 0) {
+ *//* if (tasks.size() > 0) {
iCommunication.informAboutMissingTasks(tasks, project);
} else {
// send a message to the users informing them about the start of the new phase
iCommunication.sendMessageToUsers(project, Messages.NewFeedbackTask(project));
saveState(project, changeToPhase);
- }*/
+ }*//*
}
public void createSeeAssessmentTask(Project project, User user) {
taskDAO.persist(project, user, TaskName.SEE_ASSESSMENT, Phase.Assessment);
- }
+ }*/
}
diff --git a/gemeinsamforschen/src/main/java/unipotsdam/gf/process/tasks/Task.java b/gemeinsamforschen/src/main/java/unipotsdam/gf/process/tasks/Task.java
index d986c1982ef210ca67dcfd3c8a951e8d7ae33047..eeb4171e13c7f24c1754dc3fb83e57cd156a7b5e 100644
--- a/gemeinsamforschen/src/main/java/unipotsdam/gf/process/tasks/Task.java
+++ b/gemeinsamforschen/src/main/java/unipotsdam/gf/process/tasks/Task.java
@@ -1,5 +1,6 @@
package unipotsdam.gf.process.tasks;
+import unipotsdam.gf.modules.project.Project;
import unipotsdam.gf.process.phases.Phase;
public class Task {
@@ -25,6 +26,12 @@ public class Task {
private String projectName;
private Progress progress;
+ public Task(TaskName taskName, Project project, Progress progress) {
+ this.taskName = taskName;
+ this.projectName = project.getName();
+ this.progress = progress;
+ }
+
public String getUserEmail() {
return userEmail;
}
diff --git a/gemeinsamforschen/src/main/java/unipotsdam/gf/process/tasks/TaskName.java b/gemeinsamforschen/src/main/java/unipotsdam/gf/process/tasks/TaskName.java
index a59d1f9bbcad868c31179e254379b12476304202..98a0750ae15b0c4a7b281ba29752c53bc526a0f9 100644
--- a/gemeinsamforschen/src/main/java/unipotsdam/gf/process/tasks/TaskName.java
+++ b/gemeinsamforschen/src/main/java/unipotsdam/gf/process/tasks/TaskName.java
@@ -12,6 +12,9 @@ public enum TaskName {
FINALIZE_EJOURNAL,
EDIT_FORMED_GROUPS, CONTACT_GROUP_MEMBERS, ASSESSMENT, WAITING_FOR_STUDENT_DOSSIERS, EDIT_FEEDBACK,
+ // assessment tasks
+ UPLOAD_PRESENTATION, UPLOAD_FINAL_REPORT,
GIVE_ASSESSMENT, SEE_ASSESSMENT,
- END
+ END,
+
}
diff --git a/gemeinsamforschen/src/main/webapp/project/js/tasks.js b/gemeinsamforschen/src/main/webapp/project/js/tasks.js
index da062fd86c6ea27bf2449cb203d7822d393ffd8b..9abccf0cf564049db42238883d6d33e3b1d10489 100644
--- a/gemeinsamforschen/src/main/webapp/project/js/tasks.js
+++ b/gemeinsamforschen/src/main/webapp/project/js/tasks.js
@@ -332,7 +332,9 @@ function fillObjectWithTasks(response) {
function redirect(url) {
location.href = url;
}
-
+/**
+ * TODO @Axel move this to better location
+ */
function closePhase(phase, projectName) {
let innerurl = '../rest/phases/' + phase + '/projects/' + projectName + '/end';
$.ajax({
@@ -352,6 +354,9 @@ function closePhase(phase, projectName) {
})
}
+/**
+* TODO @Axel move this to better location
+*/
function initializeGroups(projectName) {
let projq = new RequestObj(1, "/group", "/all/projects/?", [projectName], []);
serverSide(projq, "GET", function (response) {
@@ -379,6 +384,9 @@ function waitForParticipantsInfoText(object) {
return result
}
+/**
+ * TODO @Axel move this to better location
+ */
function resizeGroup(){
$.ajax({
url: '../rest/project/update/project/' + $('#projectName').html().trim() + '/groupSize/' + $('#userCount').val().trim(),
@@ -392,6 +400,9 @@ function resizeGroup(){
});
}
+/**
+ * TODO @Axel move this to better location or delete
+ */
function updateGroupSizeView(){
let userCount = parseInt($('#userCount').val().trim());
$('#groupSize').html(userCount*(userCount-1));
diff --git a/gemeinsamforschen/src/test/java/unipotsdam/gf/SurveyPreparation.java b/gemeinsamforschen/src/test/java/unipotsdam/gf/SurveyPreparation.java
index df8eb1fb6771ec2f74c51ee5630aec190c3036a9..14f7f085fa7c8ee6d93b8544e2ac3c25c4c7450b 100644
--- a/gemeinsamforschen/src/test/java/unipotsdam/gf/SurveyPreparation.java
+++ b/gemeinsamforschen/src/test/java/unipotsdam/gf/SurveyPreparation.java
@@ -6,9 +6,7 @@ public class SurveyPreparation {
public static void main(String[] args) throws Exception {
-
UpdateDB.main(new String[0]);
-
SurveyPreparationHelper surveyPreparationHelper = new SurveyPreparationHelper();
surveyPreparationHelper.prepareSurvey();
}
diff --git a/gemeinsamforschen/src/test/java/unipotsdam/gf/modules/peerassessment/HashMapTest.java b/gemeinsamforschen/src/test/java/unipotsdam/gf/modules/assessment/HashMapTest.java
similarity index 99%
rename from gemeinsamforschen/src/test/java/unipotsdam/gf/modules/peerassessment/HashMapTest.java
rename to gemeinsamforschen/src/test/java/unipotsdam/gf/modules/assessment/HashMapTest.java
index f55d6bc60da8120f660ca73f550e184ac882f86c..40b807805bce6a848d37ee49297c8872b4c7ef73 100644
--- a/gemeinsamforschen/src/test/java/unipotsdam/gf/modules/peerassessment/HashMapTest.java
+++ b/gemeinsamforschen/src/test/java/unipotsdam/gf/modules/assessment/HashMapTest.java
@@ -1,4 +1,4 @@
-package unipotsdam.gf.modules.peerassessment;
+package unipotsdam.gf.modules.assessment;
import org.junit.Test;
import unipotsdam.gf.modules.assessment.controller.model.Performance;
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 f4fd69673292b6ca8874e056387c9fddd2cfdaee..cb8cd0d4befefeb1bce3ef635f48ece9d1607944 100644
--- a/gemeinsamforschen/src/test/java/unipotsdam/gf/modules/assessment/TestAddAssessment.java
+++ b/gemeinsamforschen/src/test/java/unipotsdam/gf/modules/assessment/TestAddAssessment.java
@@ -5,6 +5,7 @@ import org.glassfish.hk2.utilities.ServiceLocatorUtilities;
import org.junit.Before;
import org.junit.Test;
import unipotsdam.gf.core.database.TestGFApplicationBinder;
+import unipotsdam.gf.modules.project.Project;
import unipotsdam.gf.mysql.MysqlConnect;
import unipotsdam.gf.mysql.VereinfachtesResultSet;
import unipotsdam.gf.interfaces.IPeerAssessment;
@@ -14,6 +15,7 @@ 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.PeerAssessment;
+import unipotsdam.gf.process.PeerAssessmentProcess;
import javax.inject.Inject;
import java.util.ArrayList;
@@ -21,8 +23,14 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
+
+
public class TestAddAssessment {
+
+ @Inject
+ private PeerAssessmentProcess peerAssessmentProcess;
+
@Inject
private IPeerAssessment peer;
private String userName = "Kevin";
@@ -164,5 +172,11 @@ public class TestAddAssessment {
connect.close();
}
+ @Test
+ public void quickstartAssessmentPhase() {
+ Project project = new Project("Meine Güte");
+ peerAssessmentProcess.startPeerAssessmentPhaseForTest(project);
+ }
+
}