From 7f37bba1018437c1029638127658bb41b069188e Mon Sep 17 00:00:00 2001 From: Frederic Debuire Date: Mon, 25 Feb 2008 13:34:33 +0000 Subject: [PATCH] Correction d'un bug du back --- .../controller/ListReportController.java | 119 +++++++++--------- .../ListReportAuthorController.java | 7 +- 2 files changed, 63 insertions(+), 63 deletions(-) diff --git a/YACOSWeb/src/org/yacos/web/PCmember/controller/ListReportController.java b/YACOSWeb/src/org/yacos/web/PCmember/controller/ListReportController.java index f7e1521..27f3442 100644 --- a/YACOSWeb/src/org/yacos/web/PCmember/controller/ListReportController.java +++ b/YACOSWeb/src/org/yacos/web/PCmember/controller/ListReportController.java @@ -5,11 +5,9 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; - import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; - import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.web.servlet.ModelAndView; @@ -26,7 +24,6 @@ import org.yacos.core.users.Role.RoleType; import org.yacos.web.system.controller.NoConferenceSelectedException; import org.yacos.web.system.session.SessionService; - public class ListReportController extends SimpleFormController { protected final Log logger = LogFactory.getLog(getClass()); @@ -43,6 +40,22 @@ public class ListReportController extends SimpleFormController { public void setArticleManager(IArticleManager articleManager) { this.articleManager = articleManager; } + + public IEvaluationManager getEvaluationManager() { + return evaluationManager; + } + + public void setEvaluationManager(IEvaluationManager evaluationManager) { + this.evaluationManager = evaluationManager; + } + + public IUserManager getUserManager() { + return userManager; + } + + public void setUserManager(IUserManager userManager) { + this.userManager = userManager; + } public ModelAndView handleRequest(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException, NoConferenceSelectedException { @@ -52,9 +65,7 @@ public class ListReportController extends SimpleFormController { List listReport=new ArrayList(); String reportId = request.getParameter("id"); - try { - Integer id = new Integer(reportId); Article a = articleManager.getArticle(id); if (a == null) @@ -62,72 +73,66 @@ public class ListReportController extends SimpleFormController { Map model = new HashMap(); - if (userManager.hasRoleForConference(SessionService.getInstance().getCurrentUserLogin(), RoleType.CHAIRMAN, SessionService.getInstance().getCurrentConferenceId())) + if (userManager.hasRoleForConference(SessionService.getInstance().getCurrentUserLogin(), RoleType.CHAIRMAN, SessionService.getInstance().getCurrentConferenceId())) { + listReport = evaluationManager.getReportsForArticle(id); - { listReport = evaluationManager.getReportsForArticle(id); + if (listReport.isEmpty()) { + model.put("whereIcome", request.getHeader("REFERER")); + model.put("listReport", null); + return new ModelAndView("listReport", model); + } + else { + model.put("listReport", listReport); - if (listReport.isEmpty()) - return new ModelAndView("listReport", "listReport", null); + List> container = new ArrayList>(); - else { model.put("listReport", listReport); - - List container=new ArrayList(); + for (int i = 0; i <= listReport.size() - 1; i++) { + List ratings = evaluationManager.getRatingForReport(listReport.get(i).getId()); + container.add(ratings); + } + model.put("container", container); + } - for (int i=0; i<=listReport.size()-1;i++){ - List ratings = evaluationManager.getRatingForReport(listReport.get(i).getId()); - container.add(ratings); - } - model.put("container", container); - } - } - else - if (userManager.hasRoleForConference(SessionService.getInstance().getCurrentUserLogin(), RoleType.PCMEMBER, SessionService.getInstance().getCurrentConferenceId())) - { + else if (userManager.hasRoleForConference(SessionService.getInstance().getCurrentUserLogin(), RoleType.PCMEMBER, SessionService.getInstance().getCurrentConferenceId())) { + if (a.getState() == State.ACCEPTED ||a.getState() == State.REJECTED) { + listReport = evaluationManager.getReportsForArticle(id); - if (a.getState()== State.ACCEPTED ||a.getState()==State.REJECTED) - { - listReport = evaluationManager.getReportsForArticle(id); + if (listReport.isEmpty()) { + model.put("whereIcome", request.getHeader("REFERER")); + model.put("listReport", null); + return new ModelAndView("listReport", model); + } + else { + model.put("listReport", listReport); - if (listReport.isEmpty()) - return new ModelAndView("listReport", "listReport", null); + List> container = new ArrayList>(); - else {model.put("listReport", listReport); - - List container=new ArrayList(); - - for (int i=0; i<=listReport.size()-1;i++){ + for (int i = 0; i <= listReport.size() - 1; i++) { List ratings = evaluationManager.getRatingForReport(listReport.get(i).getId()); container.add(ratings); } model.put("container", container); - } - } - - else{ - Report rpt = evaluationManager.getReportforArticleAndReferee(id, SessionService.getInstance().getCurrentUserLogin()); - - if (rpt==null) - return new ModelAndView("listReport", "rpt", null); - else { - model.put("rpt", rpt); - List ratings = evaluationManager.getRatingForReport(rpt.getId()); - model.put("rtgs",ratings); - - } - - } - - - - } + else { + Report rpt = evaluationManager.getReportforArticleAndReferee(id, SessionService.getInstance().getCurrentUserLogin()); + if (rpt == null) { + model.put("whereIcome", request.getHeader("REFERER")); + model.put("rpt", null); + return new ModelAndView("listReport", model); + } + else { + model.put("rpt", rpt); + List ratings = evaluationManager.getRatingForReport(rpt.getId()); + model.put("rtgs",ratings); + } + } - + } model.put("whereIcome", request.getHeader("REFERER")); @@ -146,12 +151,4 @@ public class ListReportController extends SimpleFormController { throw new ModelAndViewDefiningException(new ModelAndView("404error")); } } - - public IEvaluationManager getEvaluationManager() { - return evaluationManager; - } - - public void setEvaluationManager(IEvaluationManager evaluationManager) { - this.evaluationManager = evaluationManager; - } } \ No newline at end of file diff --git a/YACOSWeb/src/org/yacos/web/author/controller/ListReportAuthorController.java b/YACOSWeb/src/org/yacos/web/author/controller/ListReportAuthorController.java index fae145a..bb8b666 100644 --- a/YACOSWeb/src/org/yacos/web/author/controller/ListReportAuthorController.java +++ b/YACOSWeb/src/org/yacos/web/author/controller/ListReportAuthorController.java @@ -43,8 +43,11 @@ public class ListReportAuthorController extends SimpleFormController { listReport = evaluationManager.getReportsForArticle(id); - if (listReport.isEmpty()) - return new ModelAndView("listReport", "listReport", null); + if (listReport.isEmpty()) { + model.put("whereIcome", request.getHeader("REFERER")); + model.put("listReport", null); + return new ModelAndView("listReport", model); + } model.put("listReport", listReport);