Skip to content
Snippets Groups Projects
Commit 7f2a277f authored by Martin Staehr's avatar Martin Staehr
Browse files

#77 fix: create task for whole group

the task for optional porfolio entries was just created for user
uploading the dossier. now it is created for the whole group
parent 87c16682
No related branches found
No related tags found
No related merge requests found
package unipotsdam.gf.interfaces; package unipotsdam.gf.interfaces;
import unipotsdam.gf.modules.group.Group;
import unipotsdam.gf.modules.project.Project; import unipotsdam.gf.modules.project.Project;
import unipotsdam.gf.modules.user.User;
import unipotsdam.gf.process.phases.Phase; import unipotsdam.gf.process.phases.Phase;
public interface IReflectionService { public interface IReflectionService {
void startOptionalPortfolioTask(Project project, User target, Phase phase); void startOptionalPortfolioTask(Project project, Group group, Phase phase);
void finishOptionalPortfolioTask(Project project, User target, Phase phase); void finishOptionalPortfolioTask(Project project, Group group, Phase phase);
} }
...@@ -185,6 +185,10 @@ public class GroupDAO { ...@@ -185,6 +185,10 @@ public class GroupDAO {
return groupId; return groupId;
} }
public Group getMyGroup(User user, Project project) {
int groupId = getMyGroupId(user, project);
return getGroupByGroupId(groupId);
}
private void fillGroupFromResultSet(ArrayList<Group> groups, VereinfachtesResultSet vereinfachtesResultSet, private void fillGroupFromResultSet(ArrayList<Group> groups, VereinfachtesResultSet vereinfachtesResultSet,
Boolean withRocketChatId) { Boolean withRocketChatId) {
......
package unipotsdam.gf.modules.reflection.service; package unipotsdam.gf.modules.reflection.service;
import unipotsdam.gf.interfaces.IReflectionService; import unipotsdam.gf.interfaces.IReflectionService;
import unipotsdam.gf.modules.group.Group;
import unipotsdam.gf.modules.project.Project; import unipotsdam.gf.modules.project.Project;
import unipotsdam.gf.modules.user.User; import unipotsdam.gf.modules.user.User;
import unipotsdam.gf.process.phases.Phase; import unipotsdam.gf.process.phases.Phase;
...@@ -21,12 +22,17 @@ public class ReflectionService implements IReflectionService { ...@@ -21,12 +22,17 @@ public class ReflectionService implements IReflectionService {
@Inject @Inject
private TaskDAO taskDAO; private TaskDAO taskDAO;
public void startOptionalPortfolioTask(Project project, User target, Phase phase) { public void startOptionalPortfolioTask(Project project, Group group, Phase phase) {
persistOptionalEntryTask(project, target, Progress.JUSTSTARTED, phase); group.getMembers().forEach(target -> {
persistOptionalEntryTask(project, target, Progress.JUSTSTARTED, phase);
});
} }
public void finishOptionalPortfolioTask(Project project, User target, Phase phase) { public void finishOptionalPortfolioTask(Project project, Group group, Phase phase) {
persistOptionalEntryTask(project, target, Progress.FINISHED, phase); group.getMembers().forEach(target -> {
persistOptionalEntryTask(project, target, Progress.FINISHED, phase);
});
} }
private void persistOptionalEntryTask(Project project, User target, Progress progress, Phase phase) { private void persistOptionalEntryTask(Project project, User target, Progress progress, Phase phase) {
......
...@@ -76,7 +76,8 @@ public class DossierCreationProcess { ...@@ -76,7 +76,8 @@ public class DossierCreationProcess {
// this triggers the annotate task // this triggers the annotate task
taskDAO.persistTaskGroup(project, user, TaskName.ANNOTATE_DOSSIER, Phase.DossierFeedback); taskDAO.persistTaskGroup(project, user, TaskName.ANNOTATE_DOSSIER, Phase.DossierFeedback);
reflectionService.startOptionalPortfolioTask(project, user, Phase.DossierFeedback); Group group = groupDAO.getMyGroup(user, project);
reflectionService.startOptionalPortfolioTask(project, group, Phase.DossierFeedback);
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment