diff --git a/YACOSWeb/WebContent/WEB-INF/classes/messages.properties b/YACOSWeb/WebContent/WEB-INF/classes/messages.properties index ea4927a..fcb2c58 100644 --- a/YACOSWeb/WebContent/WEB-INF/classes/messages.properties +++ b/YACOSWeb/WebContent/WEB-INF/classes/messages.properties @@ -4,6 +4,7 @@ submission.title=Article's submission form.submission.article.title=Article's title form.submission.article.theme=Article's theme +form.submission.article.abstractText=Abstract form.submission.listauthor=Article's author form.submission.mainauthor=Main author form.submission.secondaryauthor=Secondary author @@ -27,4 +28,7 @@ preference.ok=You have successfully chosen all your preferences about each artic dispatch.title=Dispatch the articles to the members # Conference Form -conference.linkMenu.title=Adding Conference \ No newline at end of file +conference.titleMenu=Add a conference +conference.title=Title +conference.description=Description +conference.otherInformations=Complementary information \ No newline at end of file diff --git a/YACOSWeb/WebContent/WEB-INF/jsp/addConference.jsp b/YACOSWeb/WebContent/WEB-INF/jsp/addConference.jsp index 09c1d11..eaa30b7 100644 --- a/YACOSWeb/WebContent/WEB-INF/jsp/addConference.jsp +++ b/YACOSWeb/WebContent/WEB-INF/jsp/addConference.jsp @@ -8,8 +8,6 @@ <fmt:message key="title" /> - - - @@ -32,11 +29,15 @@ form.submit();
-

Add new conference

+

+ + - Formulaire ici +

+

+


@@ -44,7 +45,7 @@ form.submit(); - +
">Home
 
diff --git a/YACOSWeb/WebContent/WEB-INF/jsp/addConference2.jsp b/YACOSWeb/WebContent/WEB-INF/jsp/addConference2.jsp index 59432e6..3ece4cd 100644 --- a/YACOSWeb/WebContent/WEB-INF/jsp/addConference2.jsp +++ b/YACOSWeb/WebContent/WEB-INF/jsp/addConference2.jsp @@ -19,7 +19,8 @@ form.submit(); function doBack() { var form = document.monForm2; -form.action = 'addConference.htm'; +form.action = 'addConference2.htm'; +form.typeAction.value = 'back'; form.submit(); } @@ -40,6 +41,8 @@ form.submit(); + + Formulaire ici
diff --git a/YACOSWeb/WebContent/WEB-INF/jsp/menu.jsp b/YACOSWeb/WebContent/WEB-INF/jsp/menu.jsp index 220ce07..fdf2d18 100644 --- a/YACOSWeb/WebContent/WEB-INF/jsp/menu.jsp +++ b/YACOSWeb/WebContent/WEB-INF/jsp/menu.jsp @@ -8,7 +8,7 @@
  • ">
  • ">
  • ">
    • -
  • ">
    • +
  • ">
    •  
    diff --git a/YACOSWeb/WebContent/WEB-INF/jsp/submissionArticle.jsp b/YACOSWeb/WebContent/WEB-INF/jsp/submissionArticle.jsp index 4c00b36..b74fb46 100644 --- a/YACOSWeb/WebContent/WEB-INF/jsp/submissionArticle.jsp +++ b/YACOSWeb/WebContent/WEB-INF/jsp/submissionArticle.jsp @@ -38,6 +38,8 @@ function Supprimer(form) {



    +

    +



    diff --git a/YACOSWeb/src/org/yacos/web/author/controller/SArticleController.java b/YACOSWeb/src/org/yacos/web/author/controller/SArticleController.java index 95e8857..603289f 100644 --- a/YACOSWeb/src/org/yacos/web/author/controller/SArticleController.java +++ b/YACOSWeb/src/org/yacos/web/author/controller/SArticleController.java @@ -50,7 +50,8 @@ public class SArticleController extends SimpleFormController { else { byte b[] = file.getBytes(); - File file2 = new File(file.getOriginalFilename()); //mettre le bon path ici + File file2 = new File(file.getOriginalFilename()); + // TODO mettre le bon path ici FileOutputStream fos = new FileOutputStream(file2); diff --git a/YACOSWeb/src/org/yacos/web/author/form/FormSubmission.java b/YACOSWeb/src/org/yacos/web/author/form/FormSubmission.java index 515b744..7f0edfb 100644 --- a/YACOSWeb/src/org/yacos/web/author/form/FormSubmission.java +++ b/YACOSWeb/src/org/yacos/web/author/form/FormSubmission.java @@ -13,6 +13,7 @@ public class FormSubmission { private String mainauthor; private String secondaryauthor; private ArrayList liste; + private String abstractText; public FormSubmission() { @@ -59,4 +60,12 @@ public class FormSubmission { this.liste = liste; } + public String getAbstractText() { + return abstractText; + } + + public void setAbstractText(String abstractText) { + this.abstractText = abstractText; + } + } diff --git a/YACOSWeb/src/org/yacos/web/chairman/controller/AddConferenceController.java b/YACOSWeb/src/org/yacos/web/chairman/controller/AddConferenceController.java index d2ceef8..919c72e 100644 --- a/YACOSWeb/src/org/yacos/web/chairman/controller/AddConferenceController.java +++ b/YACOSWeb/src/org/yacos/web/chairman/controller/AddConferenceController.java @@ -29,7 +29,16 @@ public class AddConferenceController extends SimpleFormController{ HttpServletResponse response, Object command, BindException errors) throws Exception { - logger.info("Returning addConference view"); + String typeAction = ((FormConference) command).getTypeAction(); + + logger.info(((FormConference) command).getTitle()); + + if (typeAction.equals("back")) { + logger.info("je passe ds le back du controller 1"); + return new ModelAndView("addConference"); + } + + logger.info("Returning addConference2 view"); return new ModelAndView(new RedirectView("addConference2.htm")); } @@ -38,6 +47,7 @@ public class AddConferenceController extends SimpleFormController{ FormConference conference = null; conference = new FormConference(); + return conference; diff --git a/YACOSWeb/src/org/yacos/web/chairman/controller/AddConferenceController2.java b/YACOSWeb/src/org/yacos/web/chairman/controller/AddConferenceController2.java index 7810d81..30182d2 100644 --- a/YACOSWeb/src/org/yacos/web/chairman/controller/AddConferenceController2.java +++ b/YACOSWeb/src/org/yacos/web/chairman/controller/AddConferenceController2.java @@ -10,6 +10,7 @@ import org.springframework.web.servlet.ModelAndView; import org.springframework.web.servlet.mvc.SimpleFormController; import org.springframework.web.servlet.view.RedirectView; import org.yacos.core.conferences.IConferenceManager; +import org.yacos.web.author.form.FormSubmission; import org.yacos.web.chairman.form.FormConference; public class AddConferenceController2 extends SimpleFormController{ @@ -29,6 +30,13 @@ public class AddConferenceController2 extends SimpleFormController{ HttpServletResponse response, Object command, BindException errors) throws Exception { + String typeAction = ((FormConference) command).getTypeAction(); + + if (typeAction.equals("back")) { + logger.info("je passe ds le back du controller 2"); + return new ModelAndView("addConference"); + } + logger.info("Returning addConference2 view"); return new ModelAndView(new RedirectView("addConference3.htm")); } diff --git a/YACOSWeb/src/org/yacos/web/chairman/form/FormConference.java b/YACOSWeb/src/org/yacos/web/chairman/form/FormConference.java index 55db88d..ce826a7 100644 --- a/YACOSWeb/src/org/yacos/web/chairman/form/FormConference.java +++ b/YACOSWeb/src/org/yacos/web/chairman/form/FormConference.java @@ -5,7 +5,7 @@ import java.util.Date; public class FormConference { private Integer id; - private String titre; + private String title; private String description; private String otherInformations; private Date dateAbstract; @@ -14,6 +14,8 @@ public class FormConference { private Date dateStart; private Date dateEnd; + private String typeAction; + public FormConference () {} public Integer getId() { @@ -24,12 +26,12 @@ public class FormConference { this.id = id; } - public String getTitre() { - return titre; + public String getTitle() { + return title; } - public void setTitre(String titre) { - this.titre = titre; + public void setTitle(String title) { + this.title = title; } public String getDescription() { @@ -87,6 +89,14 @@ public class FormConference { public void setDateEnd(Date dateEnd) { this.dateEnd = dateEnd; } + + public String getTypeAction() { + return typeAction; + } + + public void setTypeAction(String typeAction) { + this.typeAction = typeAction; + }