Line 42... |
Line 42... |
42 |
Observation observation = new Observation();
|
42 |
Observation observation = new Observation();
|
43 |
observation.setAuteur(getValeurOuVide(observationJson, "auteur.prenom")+
|
43 |
observation.setAuteur(getValeurOuVide(observationJson, "auteur.prenom")+
|
44 |
" "+getValeurOuVide(observationJson,"auteur.nom"));
|
44 |
" "+getValeurOuVide(observationJson,"auteur.nom"));
|
45 |
observation.setNomAuteur(getValeurOuVide(observationJson,"auteur.nom"));
|
45 |
observation.setNomAuteur(getValeurOuVide(observationJson,"auteur.nom"));
|
46 |
observation.setPrenomAuteur(getValeurOuVide(observationJson,"auteur.nom"));
|
46 |
observation.setPrenomAuteur(getValeurOuVide(observationJson,"auteur.nom"));
|
- |
|
47 |
observation.setIdAuteur(getValeurOuVide(observationJson,"auteur.id"));
|
47 |
//TODO: renvoyer le courriel de l'auteur dans les obs
|
48 |
//TODO: renvoyer le courriel de l'auteur dans les obs
|
48 |
observation.setCourrielAuteur("");
|
49 |
observation.setCourrielAuteur("");
|
49 |
observation.setDateTransmission(getValeurOuVide(observationJson,"date_observation"));
|
50 |
observation.setDateTransmission(getValeurOuVide(observationJson,"date_observation"));
|
50 |
observation.setDateReleve(getValeurOuVide(observationJson, "date_observation"));
|
51 |
observation.setDateReleve(getValeurOuVide(observationJson, "date_observation"));
|
51 |
observation.setFamille(getValeurOuVide(observationJson, "determination.famille"));
|
52 |
observation.setFamille(getValeurOuVide(observationJson, "determination.famille"));
|
Line 89... |
Line 90... |
89 |
return propositionDetermination;
|
90 |
return propositionDetermination;
|
90 |
}
|
91 |
}
|
Line 91... |
Line 92... |
91 |
|
92 |
|
92 |
public static List<InterventionForum> parserInterventions(JSONObject interventions, Observation observation) {
|
93 |
public static List<InterventionForum> parserInterventions(JSONObject interventions, Observation observation) {
|
93 |
List<InterventionForum> listeInterventions = new ArrayList<InterventionForum>();
|
- |
|
94 |
//TODO: ne faire ceci que si la proposition correspondant à la détermination originale n'a pas été créée
|
- |
|
- |
|
94 |
List<InterventionForum> listeInterventions = new ArrayList<InterventionForum>();
|
95 |
PropositionDetermination determinationOriginale = creerPropositionDeterminationAPartirObservation(observation);
|
95 |
|
Line 96... |
Line 96... |
96 |
listeInterventions.add(determinationOriginale);
|
96 |
boolean propositionDeterminationCreee = false;
|
97 |
|
97 |
|
98 |
java.util.Iterator<String> itInterventions = interventions.keySet().iterator();
|
98 |
java.util.Iterator<String> itInterventions = interventions.keySet().iterator();
|
99 |
while (itInterventions.hasNext()) {
|
99 |
while (itInterventions.hasNext()) {
|
Line 110... |
Line 110... |
110 |
propDeter.setId(getValeurOuVide(intervention, "id_commentaire"));
|
110 |
propDeter.setId(getValeurOuVide(intervention, "id_commentaire"));
|
111 |
if(intervention.get("votes") != null && intervention.get("votes").isObject() != null) {
|
111 |
if(intervention.get("votes") != null && intervention.get("votes").isObject() != null) {
|
112 |
propDeter.setVotesDeterminations(parserVotesDetermination(intervention.get("votes").isObject(), propDeter));
|
112 |
propDeter.setVotesDeterminations(parserVotesDetermination(intervention.get("votes").isObject(), propDeter));
|
113 |
}
|
113 |
}
|
114 |
listeInterventions.add(propDeter);
|
114 |
listeInterventions.add(propDeter);
|
- |
|
115 |
|
- |
|
116 |
String idContributeur = getValeurOuVide(intervention, "ce_utilisateur");
|
- |
|
117 |
if(nomSel.equals(observation.getNomRetenu()) && idContributeur.equals(observation.getIdAuteur())) {
|
- |
|
118 |
propositionDeterminationCreee = true;
|
- |
|
119 |
}
|
115 |
}
|
120 |
}
|
116 |
}
|
121 |
}
|
Line -... |
Line 122... |
- |
|
122 |
|
- |
|
123 |
if(!propositionDeterminationCreee) {
|
- |
|
124 |
PropositionDetermination determinationOriginale = creerPropositionDeterminationAPartirObservation(observation);
|
- |
|
125 |
listeInterventions.add(0, determinationOriginale);
|
117 |
|
126 |
}
|
118 |
return listeInterventions;
|
127 |
return listeInterventions;
|
Line 119... |
Line 128... |
119 |
}
|
128 |
}
|
120 |
|
129 |
|
Line 182... |
Line 191... |
182 |
|
191 |
|
183 |
return motsClesParses;
|
192 |
return motsClesParses;
|
Line 184... |
Line 193... |
184 |
}
|
193 |
}
|
185 |
|
- |
|
186 |
public static String getIdAvecPadding(String id) {
|
194 |
|
187 |
|
- |
|
188 |
int maxZeros = 9 - id.length();
|
195 |
public static String getIdAvecPadding(String id) {
|
189 |
|
196 |
int maxZeros = 9 - id.length();
|
190 |
for (int i = 0; i < maxZeros; i++) {
|
197 |
for (int i = 0; i < maxZeros; i++) {
|
191 |
id = "0" + id;
|
- |
|
192 |
}
|
198 |
id = "0" + id;
|
193 |
|
199 |
}
|
Line 194... |
Line 200... |
194 |
return id;
|
200 |
return id;
|