diff --git a/YACOSWeb/WebContent/WEB-INF/classes/messages.properties b/YACOSWeb/WebContent/WEB-INF/classes/messages.properties index 28cb682..373c608 100644 --- a/YACOSWeb/WebContent/WEB-INF/classes/messages.properties +++ b/YACOSWeb/WebContent/WEB-INF/classes/messages.properties @@ -27,10 +27,10 @@ conference.detail.description=Description conference.detail.other=Others informations conference.detail.nosuppl=No supplementary informations. conference.detail.date.title=Important dates -conference.detail.date.start=Conference start : -conference.detail.date.end=Conference end : -conference.detail.date.article=Limit for submission of articles : -conference.detail.date.evaluation=Limit for evaluation of articles : +conference.detail.date.start=Conference start: +conference.detail.date.end=Conference end: +conference.detail.date.article=Limit for submission of articles: +conference.detail.date.evaluation=Limit for evaluation of articles: conference.detail.link.submit=Submit an article ################### @@ -113,7 +113,7 @@ form.register.error.lastNameEmpty=Last name is required form.register.error.passwordEmpty=The password can't be empty form.register.error.alreadyExists=A user with this login already exists. Please check you haven't already registered or change your login. form.link.back=Back -form.label.newaccount=You want to post an article and participate to one conference? Create your account ! +form.label.newaccount=You want to post an article and participate to one conference? Create your account! form.label.message=If you already have an account you can connect using the form.label.linkPage=opening session page form.field.account=Your account @@ -128,7 +128,7 @@ form.edit.txt=Access and edit all your personal informations. # FORGOT USER form.forgotPassword.error.emailInvalid=This email is invalid form.forgotPassword.error.unknownEmail=This email is not registered in our system -form.forgotPassword.email=E-Mail address for your account : +form.forgotPassword.email=E-Mail address for your account: form.forgotPassword.submit=Request new password form.forgotPassword.help=Please enter the email address you used for your YACOS account.\nA new password will be generated and sent into your mailbox. forgotPassword.title=Reset your password @@ -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.
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. @@ -210,7 +210,7 @@ conference.linkMenu.title=Adding Conference conference.linkMenu.choose=Select a conference conference.linkMenu.change=Change conference noCurrentConferenceText=No conference selected -currentConferenceText=You have selected : +currentConferenceText=You have selected: conference.errors.dateStartNonValid=This date is not valid conference.errors.dateStartSuperiorEnd=The start date must be earlier than the end date @@ -221,8 +221,8 @@ conference.errors.pageNumberNotValid=It should be a number conference2.title=Calendar conference2.date=Conference's date -conference2.start=Begins on : -conference2.end=Ends on : +conference2.start=Begins on: +conference2.end=Ends on: conference2.abstract=Abstract deadline conference2.article=Submission deadline conference2.evaluation=Evaluation deadline diff --git a/YACOSWeb/WebContent/WEB-INF/jsp/reportConfCreate.jsp b/YACOSWeb/WebContent/WEB-INF/jsp/reportConfCreate.jsp index f413aa5..8acad5c 100644 --- a/YACOSWeb/WebContent/WEB-INF/jsp/reportConfCreate.jsp +++ b/YACOSWeb/WebContent/WEB-INF/jsp/reportConfCreate.jsp @@ -9,50 +9,55 @@

Your conference has been successfully created.
Here is a report of the conference's informations.

- Any moment you can edit the configuration of the conference using the item menu "Modify this conference".
+ At any moment you can edit the configuration of the conference using the item menu "Modify this conference".
If you want to modify it now, just click here

-
-
- ${conferenceReport.title}
- ${conferenceReport.description}
- ${conferenceReport.otherInformations}
- -
- - Chairman: ${conferenceReport.chairman.firstName} ${conferenceReport.chairman.lastName}
-
- Important dates - - ${conferenceReport.dateArticle}
- ${conferenceReport.dateEvaluation}
- ${conferenceReport.dateStart}
- ${conferenceReport.dateEnd}
- -
+

${conferenceReport.title}

+

+
+ ${conferenceReport.description } +
+

+
+ + + + + + ${conferenceReport.otherInformations } + + +
+

+
+  
+  

+  
+  
+
+ +

+
Criterion's list
- ${crit.name} ${crit.min_rating} ${crit.max_rating}
+ ${crit.name} From ${crit.min_rating} to ${crit.max_rating}
 +
- +

+
+ Chairman: ${conferenceReport.chairman.firstName} ${conferenceReport.chairman.lastName}

PCmember's list
- ${user.firstName} ${user.lastName}
- - -
- -
- - - - ">Home + ${user.firstName} ${user.lastName}
+ + + diff --git a/YACOSWeb/src/org/yacos/web/PCmember/controller/ListArticleController.java b/YACOSWeb/src/org/yacos/web/PCmember/controller/ListArticleController.java index b44c853..0f9b812 100644 --- a/YACOSWeb/src/org/yacos/web/PCmember/controller/ListArticleController.java +++ b/YACOSWeb/src/org/yacos/web/PCmember/controller/ListArticleController.java @@ -31,7 +31,7 @@ public class ListArticleController extends SimpleFormController { List
listArticle; try { listArticle = articleManager.getArticles(SessionService.getInstance().getCurrentConferenceId()); - getServletContext().setAttribute("listArticle", listArticle); + request.getSession().setAttribute("listArticle", listArticle); } catch (ConferenceDoesntExistException e) { logger.error(e.getMessage()); } diff --git a/YACOSWeb/src/org/yacos/web/PCmember/controller/ListEvaluationController.java b/YACOSWeb/src/org/yacos/web/PCmember/controller/ListEvaluationController.java index 6cca709..20a8cc5 100644 --- a/YACOSWeb/src/org/yacos/web/PCmember/controller/ListEvaluationController.java +++ b/YACOSWeb/src/org/yacos/web/PCmember/controller/ListEvaluationController.java @@ -31,7 +31,7 @@ public class ListEvaluationController extends SimpleFormController { List
listArticle; try { listArticle = articleManager.getArticles(SessionService.getInstance().getCurrentConferenceId()); - getServletContext().setAttribute("listArticle", listArticle); + request.getSession().setAttribute("listArticle", listArticle); } catch (ConferenceDoesntExistException e) { logger.error(e.getMessage()); } diff --git a/YACOSWeb/src/org/yacos/web/PCmember/controller/ListReportController.java b/YACOSWeb/src/org/yacos/web/PCmember/controller/ListReportController.java index 4919627..eb66d2a 100644 --- a/YACOSWeb/src/org/yacos/web/PCmember/controller/ListReportController.java +++ b/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 model = new HashMap(); + listReport = evaluationManager.getReportsForArticle(idd); - getServletContext().setAttribute("listReport", listReport); + model.put("listReport", listReport); List ratings=evaluationManager.getRatingForReport(listReport.get(listReport.size()-1).getId()); - getServletContext().setAttribute("rtgs", ratings); - return new ModelAndView("listReport"); + model.put("rtgs", ratings); + + return new ModelAndView("listReport", model); } public IEvaluationManager getEvaluationManager() { diff --git a/YACOSWeb/src/org/yacos/web/PCmember/controller/ValidateArticleController.java b/YACOSWeb/src/org/yacos/web/PCmember/controller/ValidateArticleController.java index 6178298..e1a5954 100644 --- a/YACOSWeb/src/org/yacos/web/PCmember/controller/ValidateArticleController.java +++ b/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
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(); } diff --git a/YACOSWeb/src/org/yacos/web/system/controller/ArticleDownloadController.java b/YACOSWeb/src/org/yacos/web/system/controller/ArticleDownloadController.java index fc968ec..c7f49b2 100644 --- a/YACOSWeb/src/org/yacos/web/system/controller/ArticleDownloadController.java +++ b/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)); diff --git a/YACOSWeb/src/org/yacos/web/system/controller/TableBordController.java b/YACOSWeb/src/org/yacos/web/system/controller/TableBordController.java index 5a25442..8c4c6c3 100644 --- a/YACOSWeb/src/org/yacos/web/system/controller/TableBordController.java +++ b/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;