Subversion Repositories eFlore/Applications.del

Compare Revisions

Ignore whitespace Rev 1936 → Rev 1937

/trunk/src/org/tela_botanica/del/client/modeles/PropositionDetermination.java
14,17 → 14,25
/** Doit valoir 1 s'il y a un commentaire initial, sinon 0 */
private int commentaireInitial = 0;
private boolean estPropositionInitiale = false;
private boolean estPropositionRetenue = false;
 
public boolean estPropositionInitiale() {
public boolean estPropositionInitiale() {
return estPropositionInitiale;
}
 
public void setEstPropositionInitiale(boolean estPropositionInitiale) {
public void setEstPropositionInitiale(boolean estPropositionInitiale) {
this.estPropositionInitiale = estPropositionInitiale;
}
public boolean estPropositionRetenue() {
//return (this.espece.equals(this.observation.getNomRetenu()));
return estPropositionRetenue;
}
 
public void setEstPropositionRetenue(boolean estPropositionRetenue) {
this.estPropositionRetenue = estPropositionRetenue;
}
 
private Map<String, VoteDetermination> votesDeterminations = new HashMap<String, VoteDetermination>();
private Observation observation;
 
45,10 → 53,6
commentaireInitial = 0;
}
}
 
public boolean estPropositionRetenue() {
return (this.espece.equals(this.observation.getNomRetenu()));
}
public void ajouterVoteDetermination(VoteDetermination vd) {
votesDeterminations.put(vd.getContributeur(), vd);
/trunk/src/org/tela_botanica/del/client/utils/UtilitairesServiceResultat.java
234,7 → 234,14
String proposition_initiale = getValeurOuVide(jsonIntervention, "proposition_initiale");
if (proposition_initiale != null && proposition_initiale.equals("1")) {
intervention.setEstPropositionInitiale(true);
} /*else {
}
String proposition_retenue = getValeurOuVide(jsonIntervention, "proposition_retenue");
if (proposition_retenue != null && proposition_retenue.equals("1")) {
intervention.setEstPropositionRetenue(true);
}
/*else {
String nomRetObs = intervention.getObservation().getNomRetenu();
String auteur = intervention.getObservation().getAuteur();
boolean b = nom_ret.equals(nomRetObs) && intervention.getContributeur().getNomComplet().equals(auteur);