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

Browse Source
This commit is contained in:
Frederic Debuire
2008-01-24 23:48:55 +00:00
parent 9fb3d631b5
commit 5f95af28b9
3 changed files with 243 additions and 182 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
YACOSWeb/WebContent/WEB-INF/jsp/addConference4.jsp
View File

@@ -58,7 +58,8 @@ function deleteClicked(eleid) {
var person = peopleCache[eleid.substring(6)]; var person = peopleCache[eleid.substring(6)];
if (confirm("Are you sure you want to delete " + person.label + "?")) { if (confirm("Are you sure you want to delete " + person.label + "?")) {
dwr.engine.beginBatch(); dwr.engine.beginBatch();
AddCriteriaJS.deleteCriterion({ id:id }); AddCriteriaJS.deleteCriterion(person);
// FIXME here
fillTable(); fillTable();
dwr.engine.endBatch(); dwr.engine.endBatch();
} }

154
YACOSWeb/WebContent/WEB-INF/yacos-servlet.xml
View File

@@ -22,113 +22,167 @@
<property name="mappings"> <property name="mappings">
<props> <props>
<prop key="/main.htm">MainController</prop> <prop key="/main.htm">MainController</prop>
<prop key="/submissionArticleOK.htm">SArticleControllerOK</prop> <prop key="/submissionArticleOK.htm">
<prop key="/choosePreferenceOK.htm">ChoosePreferenceControllerOK</prop> SArticleControllerOK
<prop key="/listArticle.htm">ListArticleController</prop> </prop>
<prop key="/registerUser.htm">SUserRegistrationController</prop> <prop key="/choosePreferenceOK.htm">
<prop key="/submissionArticle.htm">SArticleController</prop> ChoosePreferenceControllerOK
<prop key="/choosePreference.htm">ChoosePreferenceController</prop> </prop>
<prop key="/dispatchArticle.htm">DispatchArticleController</prop> <prop key="/listArticle.htm">
<prop key="/addConference5.htm">AddConferenceController5</prop> ListArticleController
<prop key="/addConference4.htm">AddConferenceController4</prop> </prop>
<prop key="/addConference3.htm">AddConferenceController3</prop> <prop key="/registerUser.htm">
<prop key="/addConference2.htm">AddConferenceController2</prop> SUserRegistrationController
<prop key="/addConference.htm">AddConferenceController</prop> </prop>
<prop key="/submissionArticle.htm">
SArticleController
</prop>
<prop key="/choosePreference.htm">
ChoosePreferenceController
</prop>
<prop key="/dispatchArticle.htm">
DispatchArticleController
</prop>
<prop key="/addConference5.htm">
AddConferenceController5
</prop>
<prop key="/addConference4.htm">
AddConferenceController4
</prop>
<prop key="/addConference3.htm">
AddConferenceController3
</prop>
<prop key="/addConference2.htm">
AddConferenceController2
</prop>
<prop key="/addConference.htm">
AddConferenceController
</prop>
<prop key="/evaluation.htm">EvaluationController</prop> <prop key="/evaluation.htm">EvaluationController</prop>
<prop key="/createReport.htm">CreateReportController</prop> <prop key="/createReport.htm">
<prop key="/listConference.htm">ListConferenceController</prop> CreateReportController
<prop key="/chooseConference.htm">ChooseConferenceController</prop> </prop>
<prop key="/listConference.htm">
ListConferenceController
</prop>
<prop key="/chooseConference.htm">
ChooseConferenceController
</prop>
</props> </props>
</property> </property>
</bean> </bean>
<bean id="MainController" class="org.yacos.web.author.controller.MainController" /> <bean id="MainController"
class="org.yacos.web.author.controller.MainController" />
<bean id="SArticleControllerOK" class="org.yacos.web.author.controller.SArticleControllerOK" /> <bean id="SArticleControllerOK"
class="org.yacos.web.author.controller.SArticleControllerOK" />
<bean id="ChoosePreferenceControllerOK" class="org.yacos.web.PCmember.controller.ChoosePreferenceControllerOK" /> <bean id="ChoosePreferenceControllerOK"
class="org.yacos.web.PCmember.controller.ChoosePreferenceControllerOK" />
<bean id="ListArticleController" class="org.yacos.web.PCmember.controller.ListArticleController"> <bean id="ListArticleController"
class="org.yacos.web.PCmember.controller.ListArticleController">
<property name="articleManager" ref="articleManager" /> <property name="articleManager" ref="articleManager" />
</bean> </bean>
<bean id="SUserRegistrationController" class="org.yacos.web.system.controller.SUserRegistrationController"> <bean id="SUserRegistrationController"
class="org.yacos.web.system.controller.SUserRegistrationController">
<property name="sessionForm" value="true" /> <property name="sessionForm" value="true" />
<property name="commandName" value="registerUser" /> <property name="commandName" value="registerUser" />
<property name="commandClass" value="org.yacos.web.system.form.FormUser"/> <property name="commandClass"
value="org.yacos.web.system.form.FormUser" />
<property name="formView" value="registerUser" /> <property name="formView" value="registerUser" />
<property name="successView" value="listArticle.htm" /> <property name="successView" value="listArticle.htm" />
<property name="usersManager" ref="usersManager" /> <property name="usersManager" ref="usersManager" />
</bean> </bean>
<bean id="SArticleController" class="org.yacos.web.author.controller.SArticleController"> <bean id="SArticleController"
class="org.yacos.web.author.controller.SArticleController">
<property name="sessionForm" value="true" /> <property name="sessionForm" value="true" />
<property name="commandName" value="submissionArticle" /> <property name="commandName" value="submissionArticle" />
<property name="commandClass" value="org.yacos.web.author.form.FormSubmission" /> <property name="commandClass"
value="org.yacos.web.author.form.FormSubmission" />
<property name="formView" value="submissionArticle" /> <property name="formView" value="submissionArticle" />
<property name="successView" value="listArticle.htm" /> <property name="successView" value="listArticle.htm" />
<property name="articleManager" ref="articleManager" /> <property name="articleManager" ref="articleManager" />
</bean> </bean>
<bean id="ChoosePreferenceController" class="org.yacos.web.PCmember.controller.ChoosePreferenceController"> <bean id="ChoosePreferenceController"
class="org.yacos.web.PCmember.controller.ChoosePreferenceController">
<property name="sessionForm" value="true" /> <property name="sessionForm" value="true" />
<property name="commandName" value="choosePreference" /> <property name="commandName" value="choosePreference" />
<property name="commandClass" value="org.yacos.web.PCmember.form.FormPreference" /> <property name="commandClass"
value="org.yacos.web.PCmember.form.FormPreference" />
<property name="formView" value="choosePreference" /> <property name="formView" value="choosePreference" />
<property name="successView" value="choosePreference.htm" /> <property name="successView" value="choosePreference.htm" />
<property name="articleManager" ref="articleManager" /> <property name="articleManager" ref="articleManager" />
<property name="usersManager" ref="usersManager" /> <property name="usersManager" ref="usersManager" />
</bean> </bean>
<bean id="DispatchArticleController" class="org.yacos.web.PCmember.controller.DispatchArticleController"> <bean id="DispatchArticleController"
class="org.yacos.web.PCmember.controller.DispatchArticleController">
<property name="sessionForm" value="true" /> <property name="sessionForm" value="true" />
<property name="commandName" value="formDispatcher" /> <property name="commandName" value="formDispatcher" />
<property name="commandClass" value="org.yacos.web.PCmember.form.FormDispatcher" /> <property name="commandClass"
value="org.yacos.web.PCmember.form.FormDispatcher" />
<property name="formView" value="dispatchArticle" /> <property name="formView" value="dispatchArticle" />
<property name="successView" value="dispatchArticle.htm" /> <property name="successView" value="dispatchArticle.htm" />
<property name="articleManager" ref="articleManager" /> <property name="articleManager" ref="articleManager" />
</bean> </bean>
<bean id="AddConferenceController5" class="org.yacos.web.chairman.controller.AddConferenceController"> <bean id="AddConferenceController5"
class="org.yacos.web.chairman.controller.AddConferenceController">
<property name="sessionForm" value="true" /> <property name="sessionForm" value="true" />
<property name="commandName" value="formConference" /> <property name="commandName" value="formConference" />
<property name="commandClass" value="org.yacos.web.chairman.form.FormConference" /> <property name="commandClass"
value="org.yacos.web.chairman.form.FormConference" />
<property name="conferenceManager" ref="conferenceManager" /> <property name="conferenceManager" ref="conferenceManager" />
</bean> </bean>
<bean id="AddConferenceController4" class="org.yacos.web.chairman.controller.AddConferenceController"> <bean id="AddConferenceController4"
class="org.yacos.web.chairman.controller.AddConferenceController">
<dwr:remote javascript="AddCriteriaJS" /> <dwr:remote javascript="AddCriteriaJS" />
<property name="sessionForm" value="true" /> <property name="sessionForm" value="true" />
<property name="commandName" value="formConference" /> <property name="commandName" value="formConference" />
<property name="commandClass" value="org.yacos.web.chairman.form.FormConference" /> <property name="commandClass"
value="org.yacos.web.chairman.form.FormConference" />
<property name="conferenceManager" ref="conferenceManager" /> <property name="conferenceManager" ref="conferenceManager" />
</bean> </bean>
<bean id="AddConferenceController3" class="org.yacos.web.chairman.controller.AddConferenceController"> <bean id="AddConferenceController3"
class="org.yacos.web.chairman.controller.AddConferenceController">
<property name="sessionForm" value="true" /> <property name="sessionForm" value="true" />
<property name="commandName" value="formConference" /> <property name="commandName" value="formConference" />
<property name="commandClass" value="org.yacos.web.chairman.form.FormConference" /> <property name="commandClass"
value="org.yacos.web.chairman.form.FormConference" />
<property name="conferenceManager" ref="conferenceManager" /> <property name="conferenceManager" ref="conferenceManager" />
</bean> </bean>
<bean id="AddConferenceController2" class="org.yacos.web.chairman.controller.AddConferenceController"> <bean id="AddConferenceController2"
class="org.yacos.web.chairman.controller.AddConferenceController">
<property name="sessionForm" value="true" /> <property name="sessionForm" value="true" />
<property name="commandName" value="formConference" /> <property name="commandName" value="formConference" />
<property name="commandClass" value="org.yacos.web.chairman.form.FormConference" /> <property name="commandClass"
value="org.yacos.web.chairman.form.FormConference" />
<property name="conferenceManager" ref="conferenceManager" /> <property name="conferenceManager" ref="conferenceManager" />
</bean> </bean>
<bean id="AddConferenceController" class="org.yacos.web.chairman.controller.AddConferenceController"> <bean id="AddConferenceController"
class="org.yacos.web.chairman.controller.AddConferenceController">
<property name="sessionForm" value="true" /> <property name="sessionForm" value="true" />
<property name="commandName" value="formConference" /> <property name="commandName" value="formConference" />
<property name="commandClass" value="org.yacos.web.chairman.form.FormConference" /> <property name="commandClass"
value="org.yacos.web.chairman.form.FormConference" />
<property name="conferenceManager" ref="conferenceManager" /> <property name="conferenceManager" ref="conferenceManager" />
</bean> </bean>
<bean id="EvaluationController" class="org.yacos.web.PCmember.controller.EvaluationController"> <bean id="EvaluationController"
class="org.yacos.web.PCmember.controller.EvaluationController">
<property name="sessionForm" value="true" /> <property name="sessionForm" value="true" />
<property name="commandName" value="evaluationForm" /> <property name="commandName" value="evaluationForm" />
<property name="commandClass" value="org.yacos.web.PCmember.form.FormEvaluation" /> <property name="commandClass"
value="org.yacos.web.PCmember.form.FormEvaluation" />
<property name="formView" value="evaluation" /> <property name="formView" value="evaluation" />
<property name="successView" value="createReport.htm" /> <property name="successView" value="createReport.htm" />
<property name="articleManager" ref="articleManager" /> <property name="articleManager" ref="articleManager" />
@@ -136,18 +190,21 @@
<property name="conferenceManager" ref="conferenceManager" /> <property name="conferenceManager" ref="conferenceManager" />
</bean> </bean>
<bean id="CreateReportController" class="org.yacos.web.PCmember.controller.CreateReportController"> <bean id="CreateReportController"
class="org.yacos.web.PCmember.controller.CreateReportController">
<property name="articleManager" ref="articleManager" /> <property name="articleManager" ref="articleManager" />
</bean> </bean>
<!-- List all conference --> <!-- List all conference -->
<bean id="ListConferenceController" class="org.yacos.web.system.controller.ListConferenceController"> <bean id="ListConferenceController"
class="org.yacos.web.system.controller.ListConferenceController">
<property name="conferenceManager" ref="conferenceManager" /> <property name="conferenceManager" ref="conferenceManager" />
</bean> </bean>
<!-- Get chosen conference in session context --> <!-- Get chosen conference in session context -->
<bean id="ChooseConferenceController" class="org.yacos.web.system.controller.ChooseConferenceController"> <bean id="ChooseConferenceController"
class="org.yacos.web.system.controller.ChooseConferenceController">
</bean> </bean>
@@ -171,7 +228,6 @@
class="org.yacos.web.chairman.form.FormConference"> class="org.yacos.web.chairman.form.FormConference">
</dwr:convert> </dwr:convert>
<dwr:convert type="bean" <dwr:convert type="bean"
class="org.yacos.web.chairman.controller.CriterionBean"> class="org.yacos.web.chairman.controller.CriterionBean">
</dwr:convert> </dwr:convert>
@@ -204,7 +260,8 @@
<property name="suffix" value=".jsp"></property> <property name="suffix" value=".jsp"></property>
</bean> </bean>
<bean id="multipartResolver" class="org.springframework.web.multipart.commons.CommonsMultipartResolver"> <bean id="multipartResolver"
class="org.springframework.web.multipart.commons.CommonsMultipartResolver">
<property name="maxUploadSize" value="10000000" /> <property name="maxUploadSize" value="10000000" />
</bean> </bean>
@@ -215,8 +272,11 @@
</bean> </bean>
<!-- EJB Services Linking --> <!-- EJB Services Linking -->
<jee:jndi-lookup id="articleManager" jndi-name="ArticleManagerBean/remote" cache="true"/> <jee:jndi-lookup id="articleManager"
<jee:jndi-lookup id="usersManager" jndi-name="UserManagerBean/remote" cache="true"/> jndi-name="ArticleManagerBean/remote" cache="true" />
<jee:jndi-lookup id="conferenceManager" jndi-name="ConferenceManagerBean/remote" cache="true"/> <jee:jndi-lookup id="usersManager"
jndi-name="UserManagerBean/remote" cache="true" />
<jee:jndi-lookup id="conferenceManager"
jndi-name="ConferenceManagerBean/remote" cache="true" />
</beans> </beans>

4
YACOSWeb/src/org/yacos/web/chairman/controller/AddConferenceController.java
View File

@@ -84,11 +84,11 @@ public class AddConferenceController extends AbstractWizardFormController {
protected Object formBackingObject(HttpServletRequest request) throws ModelAndViewDefiningException { protected Object formBackingObject(HttpServletRequest request) throws ModelAndViewDefiningException {
logger.info("je passe ici"); logger.info("je passe ici");
FormConference conference = (FormConference)request.getSession().getAttribute("conference"); FormConference conference = (FormConference)request.getSession().getAttribute("conferenceForm");
if (conference==null) { if (conference==null) {
conference = new FormConference(); conference = new FormConference();
logger.info("je passe ici la 1ère fois"); logger.info("je passe ici la 1ère fois");
request.getSession().setAttribute("conference", conference); request.getSession().setAttribute("conferenceForm", conference);
} }
return conference; return conference;
} }