Subversion Repositories eFlore/Applications.del

Compare Revisions

Ignore whitespace Rev 226 → Rev 227

/trunk/src/org/tela_botanica/del/client/vues/plateformedetermination/forum/LigneForumPresenteur.java
20,6 → 20,7
 
public void go(FlexTable tableParente) {
ligneforumVue = new LigneForumVue(tableParente);
barreRepartitionVotePresenteur.gererEvenements();
chargerDetermination();
}
 
/trunk/src/org/tela_botanica/del/client/vues/plateformedetermination/vote/barrerepartition/BarreRepartitionVoteVue.ui.xml
5,8 → 5,8
<ui:style src="barreRepartitionVote.css" />
<g:HTMLPanel>
<div class="conteneurBoutonVote">
<g:PushButton ui:field="boutonNon" styleName="{style.boutonVote}" />
<g:PushButton ui:field="boutonOui" styleName="{style.boutonVote}" />
<g:PushButton ui:field="boutonNon" styleName="{style.boutonVote}" />
</div>
<g:HTML ui:field="barreRepartitionHtmlBrut" styleName="conteneurBarreRepartition"/>
</g:HTMLPanel>
/trunk/src/org/tela_botanica/del/client/vues/plateformedetermination/vote/barrerepartition/BarreRepartitionVotePresenteur.java
23,12 → 23,12
public void go(HasWidgets container) {
container.add(vue);
gererEvenements();
}
 
public void afficherVotes(MoyenneVote moyenneVote) {
this.moyenneVote = moyenneVote;
vue.afficherVotes(moyenneVote.getScore(), moyenneVote.getIntituleAssocie());
gererEvenements();
}
public BarreRepartitionVoteVue getBarreRepartitionVoteVue() {
46,7 → 46,7
@Override
public void onClick(ClickEvent event) {
VoteDetermination vd = new VoteDetermination();
vd.setContributeur("test");
vd.setContributeur("testeur");
vd.setDate(new Date());
vd.setVote(1);
vd.setId("3");
66,7 → 66,7
@Override
public void onClick(ClickEvent event) {
VoteDetermination vd = new VoteDetermination();
vd.setContributeur("test");
vd.setContributeur("testeur");
vd.setDate(new Date());
vd.setVote(0);
vd.setId("3");
/trunk/src/org/tela_botanica/del/client/services/CalculVoteDeterminationService.java
2,8 → 2,10
 
import java.util.ArrayList;
import java.util.Comparator;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.TreeMap;
 
import org.tela_botanica.del.client.modeles.MoyenneVote;
33,12 → 35,16
public static MoyenneVote calculerVoteDetermination(PropositionDetermination propositionDetermination) {
List<VoteDetermination> votes = propositionDetermination.getVotesDeterminations();
Map<String,VoteDetermination> votes = propositionDetermination.getVotesDeterminations();
int scoreVote = 0;
String truc = "";
if(votes.size() > 0) {
for (VoteDetermination vote : votes) {
scoreVote += vote.getVote();
Set<String> cles = votes.keySet();
for (String cle : cles) {
scoreVote += votes.get(cle).getVote();
truc += cle+" "+votes.get(cle).getVote()+"\n";
}
scoreVote = (scoreVote*100)/votes.size();
/trunk/src/org/tela_botanica/del/client/modeles/PropositionDetermination.java
3,7 → 3,11
import java.io.Serializable;
import java.util.ArrayList;
import java.util.Date;
import java.util.HashMap;
import java.util.Map;
 
import com.google.gwt.user.client.Window;
 
public class PropositionDetermination implements Serializable {
 
private static final long serialVersionUID = 840032625524143547L;
14,7 → 18,7
private String espece;
private ArrayList<VoteDetermination> votesDeterminations = new ArrayList<VoteDetermination>();
private Map<String,VoteDetermination> votesDeterminations = new HashMap<String,VoteDetermination>();
 
private String contributeur;
 
21,7 → 25,7
private Date date;
 
public void ajouterVoteDetermination(VoteDetermination vd) {
votesDeterminations.add(vd);
votesDeterminations.put(vd.getContributeur(), vd);
}
 
public String getContributeur() {
68,11 → 72,11
this.espece = espece;
}
 
public ArrayList<VoteDetermination> getVotesDeterminations() {
public Map<String, VoteDetermination> getVotesDeterminations() {
return votesDeterminations;
}
 
public void setVotesDeterminations(ArrayList<VoteDetermination> votesDeterminations) {
public void setVotesDeterminations(Map<String, VoteDetermination> votesDeterminations) {
this.votesDeterminations = votesDeterminations;
}
}
/trunk/src/org/tela_botanica/del/client/utils/MockDatasource.java
108,7 → 108,7
observationValidationData.setContributeur("contributeur test");
observationValidationData.setId("1");
 
observationValidationData.getVotesDeterminations().add(voteDetermination);
observationValidationData.ajouterVoteDetermination(voteDetermination);
observationValidationData.setDate(new Date());
observationValidationDatas.add(observationValidationData);
 
116,7 → 116,7
observationValidationData2.setContributeur("contributeur test 2");
observationValidationData2.setEspece("Lavatera arborea L.");
observationValidationData2.setId("2");
observationValidationData2.getVotesDeterminations().add(voteDetermination);
observationValidationData2.ajouterVoteDetermination(voteDetermination);
observationValidationData2.setDate(new Date());
observationValidationDatas.add(observationValidationData2);
 
128,7 → 128,7
commentaire.getListeCommentaires().add(commentaireBis);
observationValidationData3.getCommentaires().add(commentaire);
observationValidationData3.setId("1");
observationValidationData2.getVotesDeterminations().add(voteDetermination);
observationValidationData2.ajouterVoteDetermination(voteDetermination);
observationValidationData3.setDate(new Date());
observationValidationDatas.add(observationValidationData3);
 
138,7 → 138,7
Commentaire commentaire2 = new Commentaire("Greg", new Date(), "Public chéri mon amour...");
observationValidationData4.getCommentaires().add(commentaire2);
observationValidationData4.setId("2");
observationValidationData4.getVotesDeterminations().add(voteDetermination);
observationValidationData4.ajouterVoteDetermination(voteDetermination);
observationValidationData4.setDate(new Date());
observationValidationDatas.add(observationValidationData4);
 
148,7 → 148,7
Commentaire commentaire3 = new Commentaire("Greg", new Date(), "Tout est affaire de décor...");
observationValidationData5.getCommentaires().add(commentaire3);
observationValidationData5.setId("2");
observationValidationData5.getVotesDeterminations().add(voteDetermination);
observationValidationData5.ajouterVoteDetermination(voteDetermination);
observationValidationData5.setDate(new Date());
observationValidationDatas.add(observationValidationData5);