christiancorsano/yacos
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Correction d'un bug du back

Browse Source
This commit is contained in:
Frederic Debuire
2008-02-25 13:34:33 +00:00
parent 3fd37463d9
commit 7f37bba101
2 changed files with 63 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

119
YACOSWeb/src/org/yacos/web/PCmember/controller/ListReportController.java
View File

@@ -5,11 +5,9 @@ import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import javax.servlet.ServletException; import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;
import org.springframework.web.servlet.ModelAndView; 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.controller.NoConferenceSelectedException;
import org.yacos.web.system.session.SessionService; import org.yacos.web.system.session.SessionService;
public class ListReportController extends SimpleFormController { public class ListReportController extends SimpleFormController {
protected final Log logger = LogFactory.getLog(getClass()); protected final Log logger = LogFactory.getLog(getClass());
@@ -44,6 +41,22 @@ public class ListReportController extends SimpleFormController {
this.articleManager = 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) public ModelAndView handleRequest(HttpServletRequest request, HttpServletResponse response)
throws ServletException, IOException, NoConferenceSelectedException { throws ServletException, IOException, NoConferenceSelectedException {
@@ -52,9 +65,7 @@ public class ListReportController extends SimpleFormController {
List<Report> listReport=new ArrayList<Report>(); List<Report> listReport=new ArrayList<Report>();
String reportId = request.getParameter("id"); String reportId = request.getParameter("id");
try { try {
Integer id = new Integer(reportId); Integer id = new Integer(reportId);
Article a = articleManager.getArticle(id); Article a = articleManager.getArticle(id);
if (a == null) if (a == null)
@@ -62,72 +73,66 @@ public class ListReportController extends SimpleFormController {
Map <String, Object> model = new HashMap<String, Object>(); Map <String, Object> model = new HashMap<String, Object>();
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()) List<List<Rating>> container = new ArrayList<List<Rating>>();
return new ModelAndView("listReport", "listReport", null);
else { model.put("listReport", listReport); for (int i = 0; i <= listReport.size() - 1; i++) {
List<Rating> ratings = evaluationManager.getRatingForReport(listReport.get(i).getId());
List container=new ArrayList(); container.add(ratings);
}
for (int i=0; i<=listReport.size()-1;i++){ model.put("container", container);
List<Rating> ratings = evaluationManager.getRatingForReport(listReport.get(i).getId()); }
container.add(ratings);
}
model.put("container", container);
}
} }
else else if (userManager.hasRoleForConference(SessionService.getInstance().getCurrentUserLogin(), RoleType.PCMEMBER, SessionService.getInstance().getCurrentConferenceId())) {
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) if (listReport.isEmpty()) {
{ model.put("whereIcome", request.getHeader("REFERER"));
listReport = evaluationManager.getReportsForArticle(id); model.put("listReport", null);
return new ModelAndView("listReport", model);
}
else {
model.put("listReport", listReport);
if (listReport.isEmpty()) List<List<Rating>> container = new ArrayList<List<Rating>>();
return new ModelAndView("listReport", "listReport", null);
else {model.put("listReport", listReport); for (int i = 0; i <= listReport.size() - 1; i++) {
List container=new ArrayList();
for (int i=0; i<=listReport.size()-1;i++){
List<Rating> ratings = evaluationManager.getRatingForReport(listReport.get(i).getId()); List<Rating> ratings = evaluationManager.getRatingForReport(listReport.get(i).getId());
container.add(ratings); container.add(ratings);
} }
model.put("container", container); 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<Rating> 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<Rating> ratings = evaluationManager.getRatingForReport(rpt.getId());
model.put("rtgs",ratings);
}
}
}
model.put("whereIcome", request.getHeader("REFERER")); model.put("whereIcome", request.getHeader("REFERER"));
@@ -146,12 +151,4 @@ public class ListReportController extends SimpleFormController {
throw new ModelAndViewDefiningException(new ModelAndView("404error")); throw new ModelAndViewDefiningException(new ModelAndView("404error"));
} }
} }
public IEvaluationManager getEvaluationManager() {
return evaluationManager;
}
public void setEvaluationManager(IEvaluationManager evaluationManager) {
this.evaluationManager = evaluationManager;
}
} }

7
YACOSWeb/src/org/yacos/web/author/controller/ListReportAuthorController.java
View File

@@ -43,8 +43,11 @@ public class ListReportAuthorController extends SimpleFormController {
listReport = evaluationManager.getReportsForArticle(id); listReport = evaluationManager.getReportsForArticle(id);
if (listReport.isEmpty()) if (listReport.isEmpty()) {
return new ModelAndView("listReport", "listReport", null); model.put("whereIcome", request.getHeader("REFERER"));
model.put("listReport", null);
return new ModelAndView("listReport", model);
}
model.put("listReport", listReport); model.put("listReport", listReport);