| 261,12 → 261,11 |
|---|
| * Charger les votes pour chaque image |
| * */ |
| private function chargerVotes($images) { |
| |
| |
| |
| $requeteVotes = 'SELECT * FROM '. |
| $this->gestionBdd->formaterTable('del_image_vote'). |
| 'WHERE '.$this->chargerClauseWhereVotes(); |
| $requeteVotes = 'SELECT v.*, p.* FROM '. |
| $this->gestionBdd->formaterTable('del_image_vote', 'v'). |
| ' INNER JOIN del_image_protocole p '. |
| 'ON v.ce_protocole = p.id_protocole '. |
| 'WHERE '.$this->chargerClauseWhereVotes(); |
| $resultatsVotes = $this->bdd->recupererTous($requeteVotes); |
| |
| |
| 275,7 → 274,7 |
|---|
| |
| foreach ($images as $id => $image) { |
| if (isset($votes[$image['id_image']])) { |
| $images[$id]['votes'] = $votes[$image['id_image']]; |
| $images[$id]['protocoles votes'] = $votes[$image['id_image']]; |
| } |
| } |
| |
| 285,10 → 284,10 |
|---|
| private function chargerClauseWhereVotes() { |
| if (sizeof($this->imageIds) > 0) { |
| $chaineImageIds = implode(',', $this->imageIds); |
| $where[] = 'ce_image IN ('.$chaineImageIds.')'; |
| $where[] = 'v.ce_image IN ('.$chaineImageIds.')'; |
| } |
| if (isset($this->parametres['protocole'])) { |
| $where[] = 'ce_protocole = '.$this->proteger($this->parametres['protocole']); |
| $where[] = 'v.ce_protocole = '.$this->proteger($this->parametres['protocole']); |
| } |
| return implode(' AND ', $where); |
| } |
| 322,9 → 321,16 |
|---|
| foreach ($votes as $vote) { |
| $retour_vote = array(); |
| foreach ($vote as $param=>$valeur) { |
| $retour_vote[$this->mappingVotes[$param]] = $valeur; |
| if (strpos($this->mappingVotes[$param], 'protocole.') === 0) { |
| $retour_protocole[$this->mappingVotes[$param]] = $valeur; |
| } else { |
| $retour_vote[$this->mappingVotes[$param]] = $valeur; |
| } |
| } |
| $retour[$vote['ce_image']][$vote['ce_protocole']][$vote['id_vote']] = $retour_vote; |
| if (!isset($retour[$vote['ce_image']][$vote['ce_protocole']])) { |
| $retour[$vote['ce_image']][$vote['ce_protocole']] = $retour_protocole; |
| } |
| $retour[$vote['ce_image']][$vote['ce_protocole']]['votes'][$vote['id_vote']] = $retour_vote; |
| } |
| |
| return $retour; |