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

YACOSWeb : Commit de la version démo améliorée

Browse Source 
ChoosePreferences fonctionnel !
Plein de petites corrections dans pas mal d'endroit, referez-vous aux changelog de chaque fichier pour plus de détails
This commit is contained in:
conceptoire.com
2007-12-18 22:10:12 +00:00
parent 321d7dc907
commit b7f28514e6
7 changed files with 59 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
YACOSWeb/WebContent/WEB-INF/jsp/choosePreference.jsp
View File

@@ -23,15 +23,15 @@
<h2 align="center"><fmt:message key="preference.title" /></h2> <h2 align="center"><fmt:message key="preference.title" /></h2>
<form:form method="post" commandName="choosePreference"> <form:form method="post" commandName="choosePreference">
<c:if test="${empty requestScope['articleList']}"> <c:if test="${not empty articleList}">
<table> <table>
<c:forEach items="${articleList}" var="article" varStatus="i"> <c:forEach items="${articleList}" var="article" varStatus="i">
<tr> <tr>
<td><a href="<c:url value="detailArticle.htm"/>">${article.title}</a></td> <td><a href="<c:url value="detailArticle.htm"/>">${article.title}</a></td>
<form:hidden path="preferences[${i.index}].article" /> <form:hidden path="preferences[${i.index}].article.id" />
<form:hidden path="preferences[${i.index}].pcMember" /> <form:hidden path="preferences[${i.index}].pcMember.login" />
<td><fmt:message key="preference.like"/></td> <td><fmt:message key="preference.like"/></td>
<td><form:radiobutton path="preferences[${i.index}].preference" value="Like"/></td> <td><form:radiobutton path="preferences[${i.index}].preference" value="Like"/></td>
<td><fmt:message key="preference.indifferent"/></td> <td><fmt:message key="preference.indifferent"/></td>
@@ -41,7 +41,7 @@
</tr> </tr>
</c:forEach> </c:forEach>
</table> </table>
<input type="submit" value="<fmt:message key="button.OK"/>"/> <input type="submit" name="submit" value="<fmt:message key="button.OK"/>"/>
</c:if> </c:if>
</form:form> </form:form>

2
YACOSWeb/WebContent/WEB-INF/jsp/submissionArticle.jsp
View File

@@ -22,6 +22,7 @@ function Supprimer(form) {
<jsp:include page="/WEB-INF/jsp/header.jsp" /> <jsp:include page="/WEB-INF/jsp/header.jsp" />
<div class="mainBloc"> <div class="mainBloc">
<div class="header">&nbsp;</div> <div class="header">&nbsp;</div>
<div class="content"> <div class="content">
@@ -31,7 +32,6 @@ function Supprimer(form) {
<h2 align="center"><fmt:message key="submission.title" /></h2> <h2 align="center"><fmt:message key="submission.title" /></h2>
<form:form method="post" enctype="multipart/form-data" commandName="submissionArticle"> <form:form method="post" enctype="multipart/form-data" commandName="submissionArticle">

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

@@ -30,7 +30,7 @@
<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="submissionArticleOK.htm" /> <property name="successView" value="listArticle.htm" />
<property name="articleManager" ref="articleManager" /> <property name="articleManager" ref="articleManager" />
</bean> </bean>
@@ -40,7 +40,8 @@
<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="choosePreferenceOK" /> <property name="successView" value="choosePreferenceOK" />
<property name="articleManager" ref="articleManager" /> <property name="articleManager" ref="articleManager" />
<property name="usersManager" ref="usersManager" />
</bean> </bean>
<bean name="/dispatchArticle.htm" class="org.yacos.web.PCmember.controller.DispatchArticleController"> <bean name="/dispatchArticle.htm" class="org.yacos.web.PCmember.controller.DispatchArticleController">
@@ -72,6 +73,7 @@
<property name="basename" value="messages" /> <property name="basename" value="messages" />
</bean> </bean>
<jee:jndi-lookup id="articleManager" jndi-name="ArticleManagerBean/remote" cache="true"/> <jee:jndi-lookup id="articleManager" jndi-name="ArticleManagerBean/remote" cache="true"/>
<jee:jndi-lookup id="usersManager" jndi-name="UsersManagerBean/remote" cache="true"/>
</beans> </beans>

50
YACOSWeb/src/org/yacos/web/PCmember/controller/ChoosePreferenceController.java
View File

@@ -3,20 +3,17 @@ package org.yacos.web.PCmember.controller;
import java.util.*; import java.util.*;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;
import org.springframework.validation.BindException; import org.springframework.validation.BindException;
import org.springframework.web.servlet.ModelAndView; import org.springframework.web.servlet.ModelAndView;
import org.springframework.web.servlet.mvc.SimpleFormController; import org.springframework.web.servlet.mvc.SimpleFormController;
import org.springframework.web.servlet.view.RedirectView;
import org.yacos.core.article.*; import org.yacos.core.article.*;
import org.yacos.core.users.IUsersManager;
import org.yacos.core.users.User;
//import org.yacos.web.author.form.*; //import org.yacos.web.author.form.*;
import org.yacos.web.PCmember.form.FormPreference; import org.yacos.web.PCmember.form.FormPreference;
@@ -26,21 +23,34 @@ public class ChoosePreferenceController extends SimpleFormController {
protected final Log logger = LogFactory.getLog(getClass()); protected final Log logger = LogFactory.getLog(getClass());
private IArticleManager articleManager; private IArticleManager articleManager;
private IUsersManager usersManager;
@Override @Override
protected Object formBackingObject(HttpServletRequest request) protected Object formBackingObject(HttpServletRequest request)
throws Exception { throws Exception {
List<Article> articleList=new ArrayList<Article>(); List<Article> articleList=articleManager.getArticles();
Article a=new Article(1,"j2ee in action","j2ee discussion","","",null,1);
Article b=new Article(2,"php in action","php discussion","","",null,1);
articleList.add(a);
articleList.add(b);
getServletContext().setAttribute("articleList", articleList); getServletContext().setAttribute("articleList", articleList);
return super.formBackingObject(request); User toto = usersManager.getUser("toto");
ArrayList<Preference> preferencesList = new ArrayList<Preference>();
Preference pref;
for(Article article : articleList){
pref = articleManager.getArticlePreferenceForUser(article, toto.getLogin());
if(pref == null){
pref = new Preference();
pref.setArticle(article);
pref.setPcMember(toto);
pref.setPreference("Indifferent");
}
preferencesList.add(pref);
}
FormPreference preferences = new FormPreference();
preferences.setPreferences(preferencesList);
return preferences;
} }
@Override @Override
@@ -51,8 +61,14 @@ public class ChoosePreferenceController extends SimpleFormController {
FormPreference fp=(FormPreference) command; FormPreference fp=(FormPreference) command;
List<Preference> listPreference=fp.getPreferences(); List<Preference> listPreference=fp.getPreferences();
// to do with the part of core using preferenceManager
System.out.println("wangjialin"); for(Preference preference : listPreference){
articleManager.addArticlePreference(
preference.getArticle().getId(),
preference.getPcMember().getLogin(),
preference.getPreference());
}
return new ModelAndView("choosePreferenceOK"); return new ModelAndView("choosePreferenceOK");
} }
@@ -65,5 +81,11 @@ public class ChoosePreferenceController extends SimpleFormController {
this.articleManager = articleManager; this.articleManager = articleManager;
} }
public IUsersManager getUsersManager() {
return usersManager;
}
public void setUsersManager(IUsersManager usersManager) {
this.usersManager = usersManager;
}
} }

12
YACOSWeb/src/org/yacos/web/PCmember/form/FormPreference.java
View File

@@ -1,5 +1,6 @@
package org.yacos.web.PCmember.form; package org.yacos.web.PCmember.form;
import java.util.ArrayList;
import java.util.List; import java.util.List;
import org.yacos.core.article.Preference; import org.yacos.core.article.Preference;
@@ -7,16 +8,15 @@ import org.yacos.core.article.Preference;
public class FormPreference { public class FormPreference {
private List<Preference> preferences = new AutoInitArrayList <Preference> (Preference.class ); private List<Preference> preferences = new ArrayList<Preference>();
public List<Preference> getPreferences() public List<Preference> getPreferences()
{ {
return preferences; return preferences;
} }
public void setPreferences(List<Preference> preferences)
public void setPreferences(List<Preference> preferences)
{ {
this.preferences = preferences; this.preferences = preferences;
} }
} }

3
YACOSWeb/src/org/yacos/web/author/controller/SArticleController.java
View File

@@ -5,6 +5,7 @@ import java.io.FileNotFoundException;
import java.io.FileOutputStream; import java.io.FileOutputStream;
import java.io.IOException; import java.io.IOException;
import java.net.URL; import java.net.URL;
import java.util.List;
import javax.servlet.ServletException; import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
@@ -36,7 +37,7 @@ public class SArticleController extends SimpleFormController {
String theme = ((FormSubmission) command).getTheme(); String theme = ((FormSubmission) command).getTheme();
String mainauthor = ((FormSubmission) command).getMainauthor(); String mainauthor = ((FormSubmission) command).getMainauthor();
String secondaryauthor = ((FormSubmission) command).getSecondaryauthor(); String secondaryauthor = ((FormSubmission) command).getSecondaryauthor();
String liste = ((FormSubmission) command).getListe(); List<String> liste = ((FormSubmission) command).getListe();
String nomFile=""; String nomFile="";

7
YACOSWeb/src/org/yacos/web/author/form/FormSubmission.java
View File

@@ -1,5 +1,6 @@
package org.yacos.web.author.form; package org.yacos.web.author.form;
import java.util.ArrayList;
import java.util.List; import java.util.List;
import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartFile;
@@ -11,7 +12,7 @@ public class FormSubmission {
private String theme; private String theme;
private String mainauthor; private String mainauthor;
private String secondaryauthor; private String secondaryauthor;
private String liste; private ArrayList<String> liste;
public FormSubmission() { public FormSubmission() {
@@ -50,11 +51,11 @@ public class FormSubmission {
this.secondaryauthor = secondaryauthor; this.secondaryauthor = secondaryauthor;
} }
public String getListe() { public List<String> getListe() {
return liste; return liste;
} }
public void setListe(String liste) { public void setListe(ArrayList<String> liste) {
this.liste = liste; this.liste = liste;
} }