65,10 → 65,7 |
JSONValue propositions = observationJson.get("commentaires"); |
|
if (propositions != null && propositions.isObject() != null) { |
List<InterventionForum> interventions = parserInterventions(propositions.isObject()); |
for (InterventionForum interventionForum : interventions) { |
interventionForum.setObservation(observation); |
} |
List<InterventionForum> interventions = parserInterventions(propositions.isObject(), observation); |
observation.setInterventionsForum(interventions); |
} else { |
observation.ajouterPropositionDetermination(creerPropositionDeterminationAPartirObservation(observation)); |
76,8 → 73,8 |
return observation; |
} |
|
public static List<Commentaire> parserCommentaires(JSONObject commentaires) { |
List<InterventionForum> interventionForums = parserInterventions(commentaires); |
public static List<Commentaire> parserCommentaires(JSONObject commentaires, Observation observation) { |
List<InterventionForum> interventionForums = parserInterventions(commentaires, observation); |
List<Commentaire> commentairesListe = new ArrayList<Commentaire>(); |
for (InterventionForum interventionForum : interventionForums) { |
if (interventionForum instanceof Commentaire) { |
88,13 → 85,13 |
|
} |
|
public static List<InterventionForum> parserInterventions(JSONObject interventions) { |
public static List<InterventionForum> parserInterventions(JSONObject interventions, Observation observation) { |
HashMap<String, InterventionForum> interventionsNonTypees = new HashMap<String, InterventionForum>(); |
|
List<InterventionForum> retour = new ArrayList<InterventionForum>(); |
|
|
// parcourir les interventions et en faire un tableau |
if (interventions == null) { |
if(interventions==null){ |
return retour; |
} |
Iterator<String> itInterventions = interventions.keySet().iterator(); |
126,12 → 123,12 |
String nbCommentaires = getValeurOuVide(jsonIntervention, "nb_commentaires"); |
|
PropositionDetermination intervention = new PropositionDetermination(id, contributeur, texte); |
// intervention.setObservation(observation); |
intervention.setObservation(observation); |
intervention.setEspece(nom_sel); |
|
if (!nbCommentaires.equals("")) { |
int nbComm = Integer.parseInt(nbCommentaires); |
if (!texte.equals("")) { |
if(!texte.equals("")) { |
nbComm++; |
} |
intervention.setNbCommentaires(nbComm); |
142,7 → 139,7 |
} |
|
if (jsonIntervention.get("votes") != null && jsonIntervention.get("votes").isObject() != null) { |
intervention.setVotesDeterminations(parserVotesDetermination(jsonIntervention.get("votes").isObject())); |
intervention.setVotesDeterminations(parserVotesDetermination(jsonIntervention.get("votes").isObject(), intervention)); |
} |
|
intervention.setDate(date); |
170,10 → 167,11 |
} |
} |
|
|
retour.addAll(interventionsNonTypees.values()); |
return retour; |
} |
|
|
public static String convertirEtParserRetourAjoutCommentaire(String retour) { |
JSONObject retourJson = JSONParser.parseStrict(retour).isObject(); |
return parserRetourAjoutCommentaire(retourJson); |
207,7 → 205,7 |
return propositionDetermination; |
} |
|
public static HashMap<String, VoteDetermination> parserRetourListeVotesDetermination(String votesString) { |
public static HashMap<String, VoteDetermination> parserRetourListeVotesDetermination(String votesString, PropositionDetermination proposition) { |
|
HashMap<String, VoteDetermination> retour = null; |
|
214,12 → 212,12 |
JSONObject votes = JSONParser.parseStrict(votesString).isObject(); |
if (votes != null && votes.get("resultats") != null && votes.get("resultats").isObject() != null) { |
JSONObject resultat = votes.get("resultats").isObject(); |
retour = parserVotesDetermination(resultat); |
retour = parserVotesDetermination(resultat, proposition); |
} |
return retour; |
} |
|
public static HashMap<String, VoteDetermination> parserVotesDetermination(JSONObject votes) { |
public static HashMap<String, VoteDetermination> parserVotesDetermination(JSONObject votes, PropositionDetermination proposition) { |
HashMap<String, VoteDetermination> votesDetermination = new HashMap<String, VoteDetermination>(); |
java.util.Iterator<String> itVotes = votes.keySet().iterator(); |
while (itVotes.hasNext()) { |
228,6 → 226,7 |
vd.setContributeur(getValeurOuVide(vote, "auteur.id")); |
vd.setDate(new Date()); |
vd.setId(getValeurOuVide(vote, "vote.id")); |
vd.setPropositionDetermination(proposition); |
vd.setVote(Integer.parseInt(getValeurOuVide(vote, "vote"))); |
vd.setContributeur(getValeurOuVide(vote, "auteur.id")); |
|