From 82a6d8d3ef5a3c5700b21f492a2d2fdb87a9d5be Mon Sep 17 00:00:00 2001
From: fred-fri <fred-fri@dsv.su.se>
Date: Thu, 2 Aug 2012 11:46:26 +0900
Subject: [PATCH] removed manual suggesting and matching algorithm suggesting
---
.../scipro/admin/pages/match/AutomaticMatchPanel.java | 11 +++--------
.../admin/panels/match/ProjectIdeaActionPanel.html | 4 +---
.../admin/panels/match/ProjectIdeaActionPanel.java | 2 +-
3 files changed, 5 insertions(+), 12 deletions(-)
diff --git a/src/main/java/se/su/dsv/scipro/admin/pages/match/AutomaticMatchPanel.java b/src/main/java/se/su/dsv/scipro/admin/pages/match/AutomaticMatchPanel.java
index 1feea63167..245896dbfc 100644
--- a/src/main/java/se/su/dsv/scipro/admin/pages/match/AutomaticMatchPanel.java
+++ b/src/main/java/se/su/dsv/scipro/admin/pages/match/AutomaticMatchPanel.java
@@ -141,16 +141,11 @@ public class AutomaticMatchPanel extends Panel {
for (Match match : result1.matches) {
if(match.getPoints() >= points) {
match.setCreatedBy(SciProSession.get().getUser());
- if (generalSystemSettings.isMatchAlgorithmMatchesAreForceAccepted()){
+
match.setStatus(Match.Status.CONFIRMED);
match = matchDao.save(match);
-// if (match.getSupervisor().getUnit()!=null){
-// projectService.createAndExportProjectFromProjectIdea(match.getProjectIdea());
-// }
- } else {
- match.setStatus(Match.Status.PUBLISHED);
- match = matchDao.save(match);
- }
+
+
}
}
info("Saved " + result1.matches.size() + " matches");
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 5fd837d809..27eeb19ea5 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
@@ -9,9 +9,7 @@
<div class="prepend-top">If you want to match (force accept) this
idea to a supervisor manually, you can do so.</div>
<div><span wicket:id="manualMatchPanel"></span></div>
- <div class="prepend-top">If you want to suggest this
- idea to a supervisor manually, you can do so.</div>
- <div><span wicket:id="manualSuggestionPanel"></span></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 bbf3b17e78..bd1a7884af 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
@@ -36,7 +36,7 @@ public class ProjectIdeaActionPanel extends Panel {
Form<Match> form = new Form<Match>("form", matchModel);
form.add(new ManualMatchPanel("manualMatchPanel", matchModel, Match.Status.CONFIRMED));
- form.add(new ManualMatchPanel("manualSuggestionPanel", matchModel, Match.Status.PUBLISHED));
+
form.add(new ManualSetReviewerPanel("manualSetReviewerPanel", projectIdeaModel));
form.add(new ManualRefuseIdeaPanel("manualRefuseIdeaPanel", matchModel));
form.add(new AjaxSubmitLink("rematchButton") {