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

modif d'evaluation

Browse Source 
Policy failures:   
Code warning
- failed on resource EvaluationController.java. Reason: ArrayList is a raw type. References to generic type ArrayList<E> should be parameterized, line 83
- failed on resource EvaluationController.java. Reason: Type safety: The expression of type ArrayList needs unchecked conversion to conform to ArrayList<Rating>, line 8
Override reason:
This commit is contained in:
Jialin Wang
2008-01-21 21:14:42 +00:00
parent e7e9a5367e
commit 5a503be012
3 changed files with 27 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
YACOSWeb/WebContent/WEB-INF/decorators/usermenu.jsp
View File

@@ -13,6 +13,7 @@
<li><a href="<c:url value="choosePreference.htm"/>"><fmt:message key="preference.title" /></a></li> <li><a href="<c:url value="choosePreference.htm"/>"><fmt:message key="preference.title" /></a></li>
<li><a href="<c:url value="dispatchArticle.htm"/>"><fmt:message key="dispatch.title" /></a></li> <li><a href="<c:url value="dispatchArticle.htm"/>"><fmt:message key="dispatch.title" /></a></li>
<li><a href="<c:url value="addConference.htm"/>"><fmt:message key="conference.titleMenu" /></a></li> <li><a href="<c:url value="addConference.htm"/>"><fmt:message key="conference.titleMenu" /></a></li>
<li><a href="<c:url value="evaluation.htm"/>"><fmt:message key="evaluation.title" /></a></li>
</ul> </ul>
</div> </div>

37
YACOSWeb/WebContent/WEB-INF/jsp/evaluation.jsp
View File

@@ -1,24 +1,14 @@
<%@ include file="/WEB-INF/jsp/include.jsp"%> <%@ include file="/WEB-INF/decorators/include.jsp"%>
<!-- <!--
<%@ page session="false" %> spring -> true par defaut <%@ page session="false" %> spring -> true par defaut
--> -->
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
<html> <html>
<head> <head></head>
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
<title><fmt:message key="title"/></title>
<link rel="stylesheet" href="./stylesheets/base.css" type="text/css" />
</head>
<body> <body>
<jsp:include page="/WEB-INF/jsp/header.jsp" />
<div class="mainBloc">
<div class="header">&nbsp;</div>
<div class="content">
<jsp:include page="/WEB-INF/jsp/menu.jsp" />
<div id="main_content">
<h2 align="center"><fmt:message key="evaluation.title"/></h2> <h2 align="center"><fmt:message key="evaluation.title"/></h2>
@@ -27,17 +17,16 @@
<form:form method="post" commandName="evaluationForm"> <form:form method="post" commandName="evaluationForm">
<table> <table>
<c:forEach items="${simpleRatings}" var="criterion" varStatus="j"> <c:forEach items="${evaluationForm.simpleRatings}" var="criterion" varStatus="j">
<tr> <tr>
<td>${criterion.name}</td> <td>${criterion.name}</td>
<td>
<c:forEach varStatus="i" begin="${criterion.min_rating}" end="${criterion.max_rating}"> <c:forEach var="i" begin="${criterion.min_rating}" end="${criterion.max_rating}" step="1">
<c:out value="${i}"/>
<td>${i}</td> <form:radiobutton path="simpleRatings[${j.index}].value" value="${i}" />
<td><form:radiobutton path="simpleRatings[${j.index}].value" value="${i}" /></td>
</c:forEach> </c:forEach>
</td>
</tr> </tr>
</c:forEach> </c:forEach>
@@ -61,10 +50,8 @@
<a href="<c:url value="main.htm"/>">Home</a> <a href="<c:url value="main.htm"/>">Home</a>
</div>
</div>
<div class="footer">&nbsp;</div>
</div>
</body> </body>
</html> </html>

26
YACOSWeb/src/org/yacos/web/PCmember/controller/EvaluationController.java
View File

@@ -42,22 +42,16 @@ public class EvaluationController extends SimpleFormController {
conferenceManager.addConference("myTitre", "myDescirption", "myInfoComplementray", new Date(1/1/2008), new Date(1/1/2008), new Date(1/1/2008), new Date(1/1/2008), new Date(1/1/2008)); conferenceManager.addConference("myTitre", "myDescirption", "myInfoComplementray", new Date(1/1/2008), new Date(1/1/2008), new Date(1/1/2008), new Date(1/1/2008), new Date(1/1/2008));
Conference conf=conferenceManager.getConference(1); Conference conf=conferenceManager.getConference(1);
ArrayList<Criterion> criterionList = new ArrayList<Criterion>(); ArrayList<Criterion> criterionList = new ArrayList<Criterion>();
Criterion c1=new Criterion(); Criterion c1=new Criterion("respect du theme",new Integer(1),new Integer(5),conf );
c1.setName("respect du theme");
c1.setConference(conf);
c1.setMax(new Integer(5)); Criterion c2=new Criterion("coherence",new Integer(1),new Integer(3),conf );
c1.setMin(new Integer(1));
Criterion c2=new Criterion();
c2.setName("exactitude");
c2.setConference(conf);
c2.setMax(new Integer(4));
c2.setMin(new Integer(1));
criterionList.add(c1); criterionList.add(c1);
criterionList.add(c2); criterionList.add(c2);
FormEvaluation evaluationForm=new FormEvaluation(); FormEvaluation fe=new FormEvaluation();
List<SimpleCriterion> liste=new ArrayList<SimpleCriterion>(); List<SimpleCriterion> liste=new ArrayList<SimpleCriterion>();
for (Criterion c : criterionList) for (Criterion c : criterionList)
@@ -69,11 +63,11 @@ public class EvaluationController extends SimpleFormController {
liste.add(sc); liste.add(sc);
} }
if (liste!=null){System.out.println("liste n'est pas null");}
evaluationForm.setSimpleRatings(liste); fe.setSimpleRatings(liste);
evaluationForm.setCommentAuthor("no comment by author"); fe.setCommentAuthor("no comment by author");
evaluationForm.setCommentPCMember("no comment by pc member"); fe.setCommentPCMember("no comment by pc member");
return evaluationForm; return fe;
} }
@Override @Override