Subversion Repositories eFlore/Applications.del

Rev

Rev 382 | Rev 447 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 382 Rev 443
Line 1... Line 1...
1
package org.tela_botanica.del.client.modeles;
1
package org.tela_botanica.del.client.modeles;
Line 2... Line 2...
2
 
2
 
3
import java.util.ArrayList;
3
import java.util.ArrayList;
-
 
4
import java.util.Date;
4
import java.util.Date;
5
import java.util.HashMap;
Line 5... Line 6...
5
import java.util.List;
6
import java.util.List;
6
 
7
 
7
import com.google.gwt.i18n.client.DateTimeFormat;
8
import com.google.gwt.i18n.client.DateTimeFormat;
Line 21... Line 22...
21
		double total = retourJson.isObject().get("total").isNumber().doubleValue();
22
		double total = retourJson.isObject().get("total").isNumber().doubleValue();
22
		nbTotalImagesPourLaRecherche = (int) total;
23
		nbTotalImagesPourLaRecherche = (int) total;
23
		JSONArray tableauObs = retourJson.isObject().get("contenu").isArray();
24
		JSONArray tableauObs = retourJson.isObject().get("contenu").isArray();
Line 24... Line 25...
24
		
25
		
-
 
26
		images = new ArrayList<Image>();
Line 25... Line 27...
25
		images = new ArrayList<Image>();
27
		HashMap<String, Observation> observations = new HashMap<String, Observation>();
26
		
28
		
Line 27... Line 29...
27
		int nbResultats = tableauObs.size();
29
		int nbResultats = tableauObs.size();
Line 54... Line 56...
54
			java.util.Date datePropDeter = parserDateObservation(observationJson.get("date_observation").isString().stringValue());
56
			java.util.Date datePropDeter = parserDateObservation(observationJson.get("date_observation").isString().stringValue());
55
			propositionDetermination.setDate(datePropDeter);
57
			propositionDetermination.setDate(datePropDeter);
56
			propositionDetermination.setEspece(observationJson.get("nom_ret").isString().stringValue());
58
			propositionDetermination.setEspece(observationJson.get("nom_ret").isString().stringValue());
57
			observation.addImageCelValidationData(propositionDetermination);
59
			observation.addImageCelValidationData(propositionDetermination);
Line -... Line 60...
-
 
60
			
-
 
61
			if(!observations.containsKey(observation.getId())) {
-
 
62
				observations.put(observation.getId(), observation);
-
 
63
			}
-
 
64
			observations.get(observation.getId()).getImages().add(image);		
58
			
65
			
59
			image.setObservation(observation);	
66
			image.setObservation(observations.get(observation.getId()));	
60
			images.add(image);
67
			images.add(image);
61
		}
68
		}
Line 62... Line 69...
62
	}
69
	}