bugfix: fixed a lot of small issues

- implemented gfm selection and dynamic user needed count
- implemented minor changes in task handling

gemeinsamforschen/src/main/java/unipotsdam/gf/process/DossierCreationProcess.java

@@ -41,7 +41,7 @@ public class DossierCreationProcess {
             FullSubmissionPostRequest fullSubmissionPostRequest, User user, Project project) {
         FullSubmission fullSubmission = submissionController.addFullSubmission(fullSubmissionPostRequest);
 
-        taskDAO.persist(project, user, TaskName.FINALIZE_DOSSIER, Phase.DossierFeedback, TaskType.LINKED);
+        taskDAO.persist(project, user, TaskName.ANNOTATE_DOSSIER, Phase.DossierFeedback, TaskType.LINKED);
 
         return fullSubmission;
     }

gemeinsamforschen/src/main/java/unipotsdam/gf/process/tasks/TaskDAO.java

@@ -36,7 +36,6 @@ public class TaskDAO {
     @Inject
     private SubmissionController submissionController;
 
-
     // fill the task with the general data
     private Task getGeneralTask(VereinfachtesResultSet vereinfachtesResultSet) {
         Task task = new Task();
@@ -77,7 +76,6 @@ public class TaskDAO {
         return taskTypes;
     }
 
-
     private Task getTaskWaitForParticipants(VereinfachtesResultSet vereinfachtesResultSet) {
         Task task = getGeneralTask(vereinfachtesResultSet);
         Project project = new Project();
@@ -120,7 +118,7 @@ public class TaskDAO {
                     result.add(getTaskWaitForParticipants(vereinfachtesResultSet));
                     break;
                 }
-                case FINALIZE_DOSSIER: {
+                case ANNOTATE_DOSSIER: {
                     Task finalizeDossierTask = getFinalizeDossierTask(vereinfachtesResultSet);
                     //finalizeDossierTask.setTaskType(TaskType.LINKED);
                     result.add(finalizeDossierTask);
@@ -149,7 +147,6 @@ public class TaskDAO {
         return task;
     }
 
-
     public void persist(Project project, User target, TaskName taskName, Phase phase) {
         Task aDefault = createDefault(project, target, taskName, phase);
         persist(aDefault);
@@ -161,7 +158,6 @@ public class TaskDAO {
         persist(aDefault);
     }
 
-
     public void createTaskWaitForParticipants(Project project, User author) {
         Task task = createDefault(project, author, TaskName.WAIT_FOR_PARTICPANTS, Phase.GroupFormation);
         task.setTaskName(WAIT_FOR_PARTICPANTS);
@@ -222,7 +218,6 @@ public class TaskDAO {
         connect.close();
     }
 
-
     public void persistMemberTask(Project project, TaskName taskName, Phase phase) {
         java.util.List<User> members = userDAO.getUsersByProjectName(project.getName());
         for (User member : members) {

gemeinsamforschen/src/main/java/unipotsdam/gf/process/tasks/TaskName.java

@@ -5,5 +5,7 @@ public enum TaskName {
     WAIT_FOR_PARTICPANTS, CLOSE_GROUP_FINDING_PHASE, WAITING_FOR_GROUP,
 
     // Student Tasks
-    UPLOAD_DOSSIER, GIVE_FEEDBACK, CREATE_QUIZ, WRITE_EJOURNAL, FINALIZE_DOSSIER, FINALIZE_EJOURNAL, FORM_GROUPS_MANUALLY, EDIT_FORMED_GROUPS, CONTACT_GROUP_MEMBERS, ASSESSMENT
+    UPLOAD_DOSSIER, GIVE_FEEDBACK, CREATE_QUIZ, WRITE_EJOURNAL, ANNOTATE_DOSSIER, FINALIZE_DOSSIER,
+    FINALIZE_EJOURNAL,
+    FORM_GROUPS_MANUALLY, EDIT_FORMED_GROUPS, CONTACT_GROUP_MEMBERS, ASSESSMENT, EDIT_FEEDBACK
 }

gemeinsamforschen/src/main/webapp/project/js/tasks.js

@@ -120,6 +120,10 @@ function fitObjectInTmpl(object){
                 result.solveTaskWith="Lege ein EJournal an";
                 result.solveTaskWithLink="../journal/create-journal.jsp?projectName="+object.projectName;
                 break;
+            case "ANNOTATE_DOSSIER":
+                result.solveTaskWith="Annotiere das Dossier";
+                result.solveTaskWithLink="../annotation/create-unstructured-annotation.jsp?projectName="+object.projectName+"&submissionId=" + object.taskData.fullSubmissionId;
+                break;
             case "FINALIZE_DOSSIER":
                 result.solveTaskWith="Finalisiere das Dossier";
                 result.solveTaskWithLink="../annotation/create-unstructured-annotation.jsp?projectName="+object.projectName+"&submissionId=" + object.taskData.fullSubmissionId;