- Le report après la création d'une conf est fini (presque en fait ;) )

- Correction de bug (suppression de getServletContext pour des request.getSession())

YACOSWeb/WebContent/WEB-INF/classes/messages.properties

@@ -140,7 +140,7 @@ message.error.noconferenceforthisid=This conference doesn't exist. Please try ag
 message.error.noconferenceid=No conference selected
 message.error.conferenceerror=Error. Please try again.<br/>Sorry for the inconvenience.
 message.error.page404.title=Page not found
-message.error.page404.content=Sorry, the page where you looking for could not be found.
+message.error.page404.content=Sorry, the page you where looking for could not be found.
 message.error.page403.title=Access denied
 message.error.page403.content=Sorry, you can't access this page.
 

YACOSWeb/WebContent/WEB-INF/jsp/reportConfCreate.jsp

@@ -9,50 +9,55 @@
 	<p class="formOk">
 	Your conference has been successfully created.<br/>
 	Here is a report of the conference's informations.<br/><br/>
-	Any moment you can edit the configuration of the conference using the item menu "Modify this conference".<br/>
+	At any moment you can edit the configuration of the conference using the item menu "Modify this conference".<br/>
 	If you want to modify it now, just click <a href="addConference.htm?action=modify" title="Modify the conference">here</a><br/>
 	</p>
 	
-	<div id="account_data">
 	
-	<fieldset>
+		<center><h2 class="maintitle">${conferenceReport.title}</h2></center>
-		${conferenceReport.title}<br />
+		<h3 class="descriptionTitle"><fmt:message key="conference.detail.description" /></h3>
-		${conferenceReport.description}<br />
+		<div class="textBox">
-		${conferenceReport.otherInformations}<br />	
+			${conferenceReport.description }
+		</div>
+		<h3 class="descriptionTitle"><fmt:message key="conference.detail.other" /></h3>
+		<div class="textBox">
+			<c:choose>
+				<c:when test="${conferenceReport.otherInformations != null}">
+					<c:if test="${conferenceReport.otherInformations == ''}">
+						<fmt:message key="conference.detail.nosuppl" />
+					</c:if>
+					${conferenceReport.otherInformations }
+				</c:when>
+			</c:choose>
+		</div>
+		<h3 class="dateTitle"><fmt:message key="conference.detail.date.title" /></h3>
+		<div class="textBox">
+			<b><fmt:message key="conference.detail.date.start" /></b>&nbsp;<fmt:formatDate value="${conferenceReport.dateStart }" dateStyle="long" /><br />
+			<b><fmt:message key="conference.detail.date.end" /></b>&nbsp;<fmt:formatDate value="${conferenceReport.dateEnd }" dateStyle="long" /><br /><br />
+			<b><fmt:message key="conference.detail.date.article" /></b>&nbsp;<fmt:formatDate value="${conferenceReport.dateArticle }" dateStyle="long" /><br />
+			<b><fmt:message key="conference.detail.date.evaluation" /></b>&nbsp;<fmt:formatDate value="${conferenceReport.dateEvaluation }" dateStyle="long" /><br />
+		</div>
 
-		<br />
+		<h3 class="descriptionTitle"></h3>
-	
+		<div class="textBox">
-		Chairman: <b>${conferenceReport.chairman.firstName} ${conferenceReport.chairman.lastName}</b><br />
-		<br />
-		<b>Important dates</b>
-		
-		${conferenceReport.dateArticle}<br />
-		${conferenceReport.dateEvaluation}<br />
-		${conferenceReport.dateStart}<br />
-		${conferenceReport.dateEnd}<br />
-	
-		<br />
 		<c:if test="${not empty criterionReport}">
 			<b>Criterion's list </b><br />
 		</c:if>
 		<c:forEach items="${criterionReport}" var="crit">
-			${crit.name} ${crit.min_rating} ${crit.max_rating}<br />
+			${crit.name} From ${crit.min_rating} to ${crit.max_rating}<br />
 		</c:forEach>
+		</div>
 		
-		
+		<h3 class="descriptionTitle"></h3>
+		<div class="textBox">
+		<b>Chairman:</b> ${conferenceReport.chairman.firstName} ${conferenceReport.chairman.lastName}<br /><br />
 		<c:if test="${not empty userReport}">
 			<b>PCmember's list </b><br />
 		</c:if>
 		<c:forEach items="${userReport}" var="user">
-			<b>${user.firstName} ${user.lastName}</b><br />
+			${user.firstName} ${user.lastName}<br />
 		</c:forEach>
-	
-	</fieldset>
-	
 		</div>
 		
-    
-   
-	<a href="<c:url value="main.htm"/>">Home</a>
 </body>
 </html>

YACOSWeb/src/org/yacos/web/PCmember/controller/ListArticleController.java

@@ -31,7 +31,7 @@ public class ListArticleController extends SimpleFormController {
         List<Article> listArticle;
 		try {
 			listArticle = articleManager.getArticles(SessionService.getInstance().getCurrentConferenceId());
-			getServletContext().setAttribute("listArticle", listArticle);
+			request.getSession().setAttribute("listArticle", listArticle);
 		} catch (ConferenceDoesntExistException e) {
 			logger.error(e.getMessage());
 		}

YACOSWeb/src/org/yacos/web/PCmember/controller/ListEvaluationController.java

@@ -31,7 +31,7 @@ public class ListEvaluationController extends SimpleFormController {
         List<Article> listArticle;
 		try {
 			listArticle = articleManager.getArticles(SessionService.getInstance().getCurrentConferenceId());
-			getServletContext().setAttribute("listArticle", listArticle);
+			request.getSession().setAttribute("listArticle", listArticle);
 		} catch (ConferenceDoesntExistException e) {
 			logger.error(e.getMessage());
 		}

YACOSWeb/src/org/yacos/web/PCmember/controller/ListReportController.java

@@ -1,7 +1,9 @@
 package org.yacos.web.PCmember.controller;
 
 import java.io.IOException;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
@@ -32,12 +34,15 @@ public class ListReportController extends SimpleFormController {
         String id=request.getParameter("id");
         int idd=Integer.parseInt(id);
 		
+        Map <String, Object> model = new HashMap<String, Object>();
+        
 		listReport = evaluationManager.getReportsForArticle(idd);
-	    getServletContext().setAttribute("listReport", listReport);
+	    model.put("listReport", listReport);
 	    
 		List<Rating> ratings=evaluationManager.getRatingForReport(listReport.get(listReport.size()-1).getId());
-		getServletContext().setAttribute("rtgs", ratings);
+		model.put("rtgs", ratings);
-        return new ModelAndView("listReport");
+		
+        return new ModelAndView("listReport", model);
     }
 	
     public IEvaluationManager getEvaluationManager() {

YACOSWeb/src/org/yacos/web/PCmember/controller/ValidateArticleController.java

@@ -26,14 +26,11 @@ public class ValidateArticleController extends SimpleFormController {
             throws ServletException, IOException{
 		
         logger.info("Returning validateArticle view");
-        //FIXME  user "toto" a remplacer par le vrai PCmembre
         List<Article> listArticleValidate;
-		//listArticleValidate = articleManager.getArticlesOfMember(SessionService.getInstance().getCurrentConferenceId(),"toto");
         try {
 			listArticleValidate = articleManager.getArticles(SessionService.getInstance().getCurrentConferenceId());
-			 getServletContext().setAttribute("listArticleValidate", listArticleValidate);
+			 request.getSession().setAttribute("listArticleValidate", listArticleValidate);
 		} catch (ConferenceDoesntExistException e) {
-			// TODO Auto-generated catch block
 			e.printStackTrace();
 		}
        

YACOSWeb/src/org/yacos/web/system/controller/ArticleDownloadController.java

@@ -57,6 +57,9 @@ public class ArticleDownloadController implements Controller {
 			}
 			int length = (int) llength;
 			
+			if (!file.exists())
+				return new ModelAndView(new RedirectView("404error.htm"));
+			
 			// We use a BufferedReader to avoid loading the whole file in memory at once
 			BufferedInputStream in = new BufferedInputStream(
 					new FileInputStream(file));

YACOSWeb/src/org/yacos/web/system/controller/TableBordController.java

@@ -1,4 +1,5 @@
 package org.yacos.web.system.controller;
+
 import java.io.IOException;
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;