441,7 → 441,7 |
$requetePropositions = 'SELECT * FROM '.$this->gestionBdd->formaterTable('del_commentaire', 'dc'). |
'WHERE dc.nom_sel IS NOT NULL AND ce_observation = '.$observation['id_observation']; |
$propositions = $this->bdd->recupererTous($requetePropositions); |
$observations[$id]['propositions'] = $this->formaterDeterminations($propositions); |
$observations[$id]['commentaires'] = $this->formaterDeterminations($propositions); |
} |
return $observations; |
} |
469,7 → 469,7 |
|
$resultatsVotes = $this->bdd->recupererTous($requeteVotes); |
foreach ($resultatsVotes as $vote) { |
$propositions[$vote['ce_proposition']]['votes'][] = $this->formaterVotes($vote); |
$propositions[$vote['ce_proposition']]['votes'][$vote['id_vote']] = $this->formaterVotes($vote); |
} |
return $propositions; |
} |
483,8 → 483,8 |
'FROM '.$this->gestionBdd->formaterTable('del_commentaire'). |
'WHERE ce_proposition IN ('.implode(', ', $ids_proposition).')'; |
$nbCommentaires = $this->bdd->recuperer($requeteNbCommentaires); |
foreach ($nbCommentaires as $vote) { |
$propositions[$vote['ce_proposition']]['commentaires']= $vote; |
foreach ($nbCommentaires as $nbCommentaire) { |
$propositions[$nbCommentaire['ce_proposition']]['nb_commentaires']= $nbCommentaire; |
} |
return $propositions; |
} |
548,7 → 548,7 |
private function formaterVotes($vote) { |
$retour = array(); |
foreach ($vote as $param=>$valeur) { |
$retour[$vote['id_vote']][$this->mappingVotes[$param]] = $valeur; |
$retour[$this->mappingVotes[$param]] = $valeur; |
} |
return $retour; |
} |