Subversion Repositories eFlore/Applications.del

Compare Revisions

Ignore whitespace Rev 359 → Rev 360

/trunk/src/org/tela_botanica/del/client/vues/comparaisoneflore/ComparaisonEflorePresenteur.java
43,7 → 43,7
this.vue = vue;
this.imagePrincipale = CacheClient.getInstance().getImageCourante();
this.nomTaxonComparaison = CacheClient.getInstance().getTaxonPourRechercheEflore();
this.imageService=imageService;
this.imageService = imageService;
}
 
public void go(HasWidgets composite) {
60,18 → 60,18
}
 
public void chargerObservationsEflore() {
 
ImagesParTaxonCallback callback = new ImagesParTaxonCallback() {
 
@Override
public void surImagesRecues(ImageServiceResultat imagesRecues) {
//CacheClient.getInstance().setImages(imagesRecues.getImages());
setImagesEflore(imagesRecues.getImages());
vue.chargerImagesEflore(imagesRecues.getImages(), 0);
}
};
 
imageService.getImagesEfloreParTaxon(nomTaxonComparaison, callback);
 
}
 
private void gererEvenements() {
96,4 → 96,8
return imagesEflore;
}
 
public void setImagesEflore(List<org.tela_botanica.del.client.modeles.Image> imagesEflore) {
this.imagesEflore = imagesEflore;
}
 
}
/trunk/src/org/tela_botanica/del/client/vues/comparaisoneflore/ComparaisonEfloreVue.java
38,17 → 38,21
 
// mots clefs
String motsClefsConcatenes = "";
for (String motClef : image.getObservation().getMotsClefs()) {
motsClefsConcatenes += motClef + ",";
try {
for (String motClef : image.getObservation().getMotsClefs()) {
motsClefsConcatenes += motClef + ",";
}
motsClefsConcatenes = motsClefsConcatenes.subSequence(0, motsClefsConcatenes.lastIndexOf(",")).toString();
} catch (Exception e) {
// TODO: handle exception
}
motsClefsConcatenes = motsClefsConcatenes.subSequence(0, motsClefsConcatenes.lastIndexOf(",")).toString();
 
// validateurs
String validateursConcatenes = "";
for (VoteProtocole observationValidation : image.getVoteProtocoles()) {
validateursConcatenes += observationValidation.getContributeur() + ", ";
}
try {
for (VoteProtocole observationValidation : image.getVoteProtocoles()) {
validateursConcatenes += observationValidation.getContributeur() + ", ";
}
validateursConcatenes = validateursConcatenes.subSequence(0, validateursConcatenes.lastIndexOf(",")).toString();
} catch (Exception e) {
 
56,12 → 60,15
 
// date derniere validation
Date dateDerniereValidation = null;
for (VoteProtocole observationValidation : image.getVoteProtocoles()) {
if (dateDerniereValidation == null) {
dateDerniereValidation = observationValidation.getDate();
} else if (dateDerniereValidation.before(observationValidation.getDate())) {
dateDerniereValidation = observationValidation.getDate();
try {
for (VoteProtocole observationValidation : image.getVoteProtocoles()) {
if (dateDerniereValidation == null) {
dateDerniereValidation = observationValidation.getDate();
} else if (dateDerniereValidation.before(observationValidation.getDate())) {
dateDerniereValidation = observationValidation.getDate();
}
}
} catch (Exception e) {
}
 
motsClefs.setText(motsClefsConcatenes);