DMC/scipro
7
0
Fork 0
Code Issues30 Pull Requests3 Actions Projects1 Releases Wiki Activity

removed manual suggesting and matching algorithm suggesting

Browse Source
This commit is contained in:
fred-fri 2012-08-02 11:46:26 +09:00
parent 7d01e1bbb1
commit 82a6d8d3ef
3 changed files with 5 additions and 12 deletions
src/main/java/se/su/dsv/scipro/admin
pages/match
AutomaticMatchPanel.java
panels/match
ProjectIdeaActionPanel.htmlProjectIdeaActionPanel.java

11
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");

4
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>

2
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") {