Subversion Repositories eFlore/Applications.del

Compare Revisions

Regard whitespace Rev 182 → Rev 199

/src/org/tela_botanica/del/client/utils/MockDatasource.java
131,6 → 131,7
observationValidationData5.setDate(new Date());
observationValidationDatas.add(observationValidationData5);
 
int numobs = 44120;
for (int i = 0; i < 20; i++) {
 
Observation observation = new Observation();
138,7 → 139,7
observation.setAuteur(auteur);
observation.setSpecies(auteurObs.get(auteur));
 
int numobs = 44120 + i;
numobs += i;
observation.setNumNomenclatural("num nomenclatural " + i);
observation.setDate(DateTimeFormat.getFormat(PredefinedFormat.DATE_SHORT).format(new Date()));
observation.setFamille("famille " + i);
149,11 → 150,27
 
Image image = new Image();
image.setIdImage("id image " + i);
image.setUrlFormat("http://www.tela-botanica.org/appli:cel-img:0000" + String.valueOf(numobs) + "%s%.jpg");
image.setUrl("http://www.tela-botanica.org/appli:cel-img:0000" + String.valueOf(numobs) + "CRS.jpg");
image.setMiniature("http://www.tela-botanica.org/appli:cel-img:0000" + String.valueOf(numobs) + "XS.jpg");
observation.getImages().add(image);
image.setObservation(observation);
images.add(image);
 
// nombre d'images aléatoires
int nbImagesAssociees = (int) Math.round(Math.random() * 10);
for (int j = 0; j < nbImagesAssociees; j++) {
numobs++;
image = new Image();
image.setIdImage("id image " + i);
image.setUrlFormat("http://www.tela-botanica.org/appli:cel-img:0000" + String.valueOf(numobs) + "%s%.jpg");
image.setUrl("http://www.tela-botanica.org/appli:cel-img:0000" + String.valueOf(numobs) + "CRS.jpg");
image.setMiniature("http://www.tela-botanica.org/appli:cel-img:0000" + String.valueOf(numobs) + "XS.jpg");
observation.getImages().add(image);
image.setObservation(observation);
images.add(image);
}
 
VoteProtocole voteProtocole = new VoteProtocole();
voteProtocole.setProtocol(protocol1);
voteProtocole.setVote(3);
196,8 → 213,18
}
public List<Observation> getObservations(HashMap<String, String> champsRecherche) {
return observations;
if (champsRecherche == null) {
return getObservations();
} else {
int nbResultats = (int) Math.round(Math.random() * 20);
List<Observation> resultatRecherche = new ArrayList<Observation>();
for (int i = 0; i < nbResultats; i++) {
int numeroResultat = (int) Math.round(Math.random() * (observations.size() - 1));
resultatRecherche.add(observations.get(numeroResultat));
}
return resultatRecherche;
}
}
 
public List<Observation> getObservations() {
return observations;