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

View File

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

View File

@@ -22,132 +22,189 @@
<property name="mappings">
<props>
<prop key="/main.htm">MainController</prop>
<prop key="/submissionArticleOK.htm">SArticleControllerOK</prop>
<prop key="/choosePreferenceOK.htm">ChoosePreferenceControllerOK</prop>
<prop key="/listArticle.htm">ListArticleController</prop>
<prop key="/registerUser.htm">SUserRegistrationController</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="/submissionArticleOK.htm">
SArticleControllerOK
</prop>
<prop key="/choosePreferenceOK.htm">
ChoosePreferenceControllerOK
</prop>
<prop key="/listArticle.htm">
ListArticleController
</prop>
<prop key="/registerUser.htm">
SUserRegistrationController
</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="/createReport.htm">CreateReportController</prop>
<prop key="/listConference.htm">ListConferenceController</prop>
<prop key="/chooseConference.htm">ChooseConferenceController</prop>
<prop key="/createReport.htm">
CreateReportController
</prop>
<prop key="/listConference.htm">
ListConferenceController
</prop>
<prop key="/chooseConference.htm">
ChooseConferenceController
</prop>
</props>
</property>
</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" />
</bean>
<bean id="SUserRegistrationController" class="org.yacos.web.system.controller.SUserRegistrationController">
<property name="sessionForm" value="true"/>
<property name="commandName" value="registerUser"/>
<property name="commandClass" value="org.yacos.web.system.form.FormUser"/>
<property name="formView" value="registerUser"/>
<bean id="SUserRegistrationController"
class="org.yacos.web.system.controller.SUserRegistrationController">
<property name="sessionForm" value="true" />
<property name="commandName" value="registerUser" />
<property name="commandClass"
value="org.yacos.web.system.form.FormUser" />
<property name="formView" value="registerUser" />
<property name="successView" value="listArticle.htm" />
<property name="usersManager" ref="usersManager" />
</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="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="successView" value="listArticle.htm" />
<property name="articleManager" ref="articleManager" />
</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="commandName" value="choosePreference"/>
<property name="commandClass" value="org.yacos.web.PCmember.form.FormPreference" />
<property name="commandName" value="choosePreference" />
<property name="commandClass"
value="org.yacos.web.PCmember.form.FormPreference" />
<property name="formView" value="choosePreference" />
<property name="successView" value="choosePreference.htm" />
<property name="articleManager" ref="articleManager" />
<property name="usersManager" ref="usersManager" />
</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="commandName" value="formDispatcher"/>
<property name="commandClass" value="org.yacos.web.PCmember.form.FormDispatcher" />
<property name="commandName" value="formDispatcher" />
<property name="commandClass"
value="org.yacos.web.PCmember.form.FormDispatcher" />
<property name="formView" value="dispatchArticle" />
<property name="successView" value="dispatchArticle.htm" />
<property name="articleManager" ref="articleManager" />
</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="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" />
</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" />
<property name="sessionForm" value="true" />
<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" />
</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="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" />
</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="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" />
</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="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" />
</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="commandName" value="evaluationForm"/>
<property name="commandClass" value="org.yacos.web.PCmember.form.FormEvaluation" />
<property name="commandName" value="evaluationForm" />
<property name="commandClass"
value="org.yacos.web.PCmember.form.FormEvaluation" />
<property name="formView" value="evaluation" />
<property name="successView" value="createReport.htm" />
<property name="articleManager" ref="articleManager" />
<property name="usersManager" ref="usersManager" />
<property name="conferenceManager" ref="conferenceManager"/>
<property name="conferenceManager" ref="conferenceManager" />
</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" />
</bean>
<!-- 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" />
</bean>
<!-- 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>
@@ -171,7 +228,6 @@
class="org.yacos.web.chairman.form.FormConference">
</dwr:convert>
<dwr:convert type="bean"
class="org.yacos.web.chairman.controller.CriterionBean">
</dwr:convert>
@@ -181,13 +237,13 @@
<!-- <dwr:convert type="bean"
class="iConfWeb.bean.viewPaper.DetailPaper">
</dwr:convert>
<dwr:convert type="bean"
</dwr:convert>
<dwr:convert type="bean"
class="iConfWeb.bean.assignation.PcMemberBean">
</dwr:convert>
<dwr:convert type="bean"
</dwr:convert>
<dwr:convert type="bean"
class="iConfWeb.bean.assignation.Assignations">
</dwr:convert> -->
</dwr:convert> -->
<dwr:convert type="bean" class="java.lang.StackTraceElement"></dwr:convert>
<dwr:convert type="exception" class="java.lang.exception"></dwr:convert>
@@ -204,7 +260,8 @@
<property name="suffix" value=".jsp"></property>
</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" />
</bean>
@@ -215,8 +272,11 @@
</bean>
<!-- EJB Services Linking -->
<jee:jndi-lookup id="articleManager" jndi-name="ArticleManagerBean/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"/>
<jee:jndi-lookup id="articleManager"
jndi-name="ArticleManagerBean/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>

View File

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