diff --git a/src/main/java/se/su/dsv/scipro/admin/panels/ManualMatchPanel.java b/src/main/java/se/su/dsv/scipro/admin/panels/ManualMatchPanel.java index 54b209e831..aa5711a3f7 100644 --- a/src/main/java/se/su/dsv/scipro/admin/panels/ManualMatchPanel.java +++ b/src/main/java/se/su/dsv/scipro/admin/panels/ManualMatchPanel.java @@ -41,13 +41,15 @@ public class ManualMatchPanel extends Panel { private Form<Employee> matchForm; private AutocompleteComponent<Employee> autocompleteSupervisorField; private Long supervisorId; - public ManualMatchPanel(String id, IModel<Match> matchModel) { + private boolean confirmed; + public ManualMatchPanel(String id, IModel<Match> matchModel, final boolean confirmed__) { super(id); supervisorId = matchModel.getObject().getSupervisor() != null ? matchModel.getObject().getSupervisor().getId() : 0L; setOutputMarkupPlaceholderTag(true); currentFragment = createButtonFragment(); alternateFragment = createMatchFragment(matchModel); add(currentFragment); + confirmed = confirmed__; } private Fragment createButtonFragment() { @@ -95,7 +97,11 @@ public class ManualMatchPanel extends Panel { @Override public void onSubmit() { matchModel.getObject().setSupervisor(autocompleteSupervisorField.getModelObject()); - matchModel.getObject().setStatus(Status.CONFIRMED); + if(confirmed) { + matchModel.getObject().setStatus(Status.CONFIRMED); + } else { + matchModel.getObject().setStatus(Status.PUBLISHED); + } matchDao.changeStatus(SciProSession.get().getUser(), matchModel.getObject(), null); } }; diff --git a/src/main/java/se/su/dsv/scipro/admin/panels/match/ManualWatsonPanel.java b/src/main/java/se/su/dsv/scipro/admin/panels/match/ManualWatsonPanel.java index 7563fd8f90..52d566707f 100644 --- a/src/main/java/se/su/dsv/scipro/admin/panels/match/ManualWatsonPanel.java +++ b/src/main/java/se/su/dsv/scipro/admin/panels/match/ManualWatsonPanel.java @@ -16,7 +16,7 @@ public class ManualWatsonPanel extends Panel { public ManualWatsonPanel(String id, IModel<ProjectIdea> model) { super(id); if (model.getObject()!=null){ - add(new ManualMatchPanel("manual", new PropertyModel<Match>(model, "match"))); + add(new ManualMatchPanel("manual", new PropertyModel<Match>(model, "match"), true)); add(new WatsonInfoPanel("watson", model.getObject().getMatch().getProjectIdea())); } } diff --git a/src/main/java/se/su/dsv/scipro/admin/panels/match/ProjectIdeaActionPanel.html b/src/main/java/se/su/dsv/scipro/admin/panels/match/ProjectIdeaActionPanel.html index 7ee8f67c90..122024a6fd 100644 --- a/src/main/java/se/su/dsv/scipro/admin/panels/match/ProjectIdeaActionPanel.html +++ b/src/main/java/se/su/dsv/scipro/admin/panels/match/ProjectIdeaActionPanel.html @@ -6,9 +6,12 @@ <div wicket:id="removeAuthorPanel"></div> <form wicket:id="form"> - <div class="prepend-top">If you want to match and confirm this + <div class="prepend-top">If you want to match (CONFIRM) this idea to a supervisor or reviewer manually, you can do so.</div> <div wicket:id="manualMatchPanel"></div> + <div class="prepend-top">If you want to suggest (PUBLISH) this + idea to a supervisor or reviewer manually, you can do so.</div> + <div wicket:id="manualSuggPanel"></div> <div class="prepend-top">If this project idea is poorly written, it should be refused, which means it will be sent back to the authors for rewriting.</div> diff --git a/src/main/java/se/su/dsv/scipro/admin/panels/match/ProjectIdeaActionPanel.java b/src/main/java/se/su/dsv/scipro/admin/panels/match/ProjectIdeaActionPanel.java index 2788a1d13c..53462d73f0 100644 --- a/src/main/java/se/su/dsv/scipro/admin/panels/match/ProjectIdeaActionPanel.java +++ b/src/main/java/se/su/dsv/scipro/admin/panels/match/ProjectIdeaActionPanel.java @@ -19,14 +19,14 @@ public class ProjectIdeaActionPanel extends Panel { @SpringBean private MatchDao matchDao; - private ManualMatchPanel manualMatchPanel; - public ProjectIdeaActionPanel(String id, final IModel<Match> matchModel) { super(id); add(new ProjectIdeaRemoveAuthorPanel("removeAuthorPanel", new Model(matchModel.getObject().getProjectIdea())).setVisible(matchModel.getObject().getProjectIdea().getAuthors().size()>1)); Form<Match> form = new Form<Match>("form", matchModel); - form.add(manualMatchPanel = new ManualMatchPanel("manualMatchPanel", matchModel)); + + form.add(new ManualMatchPanel("manualMatchPanel", matchModel, true)); + form.add(new ManualMatchPanel("manualSuggPanel", matchModel, false)); form.add(new Button("sendBackButton") { private static final long serialVersionUID = 1L;