| Line 381... |
Line 381... |
| 381 |
$requeteLiaisons .= $this->chargerClauseWhere();
|
381 |
$requeteLiaisons .= $this->chargerClauseWhere();
|
| 382 |
$requeteLiaisons .= ' GROUP BY doi.id_observation';
|
382 |
$requeteLiaisons .= ' GROUP BY doi.id_observation';
|
| 383 |
$requeteLiaisons .= ' ORDER BY '.$this->tri.' '.$this->directionTri.' ';
|
383 |
$requeteLiaisons .= ' ORDER BY '.$this->tri.' '.$this->directionTri.' ';
|
| 384 |
$requeteLiaisons .= $this->gestionBdd->getLimitSql();
|
384 |
$requeteLiaisons .= $this->gestionBdd->getLimitSql();
|
| Line -... |
Line 385... |
| - |
|
385 |
|
| 385 |
|
386 |
|
| 386 |
return $this->bdd->recupererTous($requeteLiaisons);
|
387 |
return $this->bdd->recupererTous($requeteLiaisons);
|
| Line 387... |
Line 388... |
| 387 |
}
|
388 |
}
|
| 388 |
|
389 |
|
| Line 445... |
Line 446... |
| 445 |
}
|
446 |
}
|
| 446 |
return $observations;
|
447 |
return $observations;
|
| 447 |
}
|
448 |
}
|
| Line 448... |
Line 449... |
| 448 |
|
449 |
|
| - |
|
450 |
private function formaterDeterminations($propositions) {
|
| 449 |
private function formaterDeterminations($propositions) {
|
451 |
|
| 450 |
$propositions_format = array();
|
452 |
$propositions_format = array();
|
| 451 |
if ($propositions != array()) {
|
453 |
if ($propositions != array()) {
|
| 452 |
foreach ($propositions as $id => $proposition) {
|
454 |
foreach ($propositions as $id => $proposition) {
|
| 453 |
$propositions_format[$proposition['id_commentaire']] = $proposition;
|
455 |
$propositions_format[$proposition['id_commentaire']] = $proposition;
|
| 454 |
$propositions_format[$proposition['id_commentaire']]['nb_commentaires'] = "0";
|
456 |
$propositions_format[$proposition['id_commentaire']]['nb_commentaires'] = "0";
|
| 455 |
$ids_proposition[] = $proposition['id_commentaire'];
|
457 |
$ids_proposition[] = $proposition['id_commentaire'];
|
| - |
|
458 |
}
|
| 456 |
}
|
459 |
|
| 457 |
$propositions_format = $this->chargerVotes($ids_proposition, $propositions_format);
|
460 |
$propositions_format = $this->chargerVotes($ids_proposition, $propositions_format);
|
| - |
|
461 |
$propositions_format = $this->chargerNombreCommentaire($ids_proposition, $propositions_format);
|
| 458 |
$propositions_format = $this->chargerNombreCommentaire($ids_proposition, $propositions_format);
|
462 |
|
| 459 |
}
|
463 |
}
|
| 460 |
return $propositions_format;
|
464 |
return $propositions_format;
|
| 461 |
}
|
465 |
}
|
| 462 |
/**
|
466 |
/**
|
| Line 481... |
Line 485... |
| 481 |
* */
|
485 |
* */
|
| 482 |
private function chargerNombreCommentaire($ids_proposition, $propositions) {
|
486 |
private function chargerNombreCommentaire($ids_proposition, $propositions) {
|
| 483 |
$requeteNbCommentaires = 'SELECT ce_proposition, COUNT(id_commentaire) as nb '.
|
487 |
$requeteNbCommentaires = 'SELECT ce_proposition, COUNT(id_commentaire) as nb '.
|
| 484 |
'FROM del_commentaire '.
|
488 |
'FROM del_commentaire '.
|
| 485 |
'WHERE ce_proposition IN ('.implode(', ', $ids_proposition).')';
|
489 |
'WHERE ce_proposition IN ('.implode(', ', $ids_proposition).')';
|
| 486 |
|
- |
|
| 487 |
$nbCommentaires = $this->bdd->recuperer($requeteNbCommentaires);
|
490 |
$nbCommentaires = $this->bdd->recuperer($requeteNbCommentaires);
|
| 488 |
foreach ($nbCommentaires as $nbCommentaire) {
|
491 |
foreach ($nbCommentaires as $nbCommentaire) {
|
| 489 |
// ce test sert à exclure les proposition de 1er niveau qui sont elles aussi des commentaires
|
492 |
// ce test sert à exclure les proposition de 1er niveau qui sont elles aussi des commentaires
|
| 490 |
if($nbCommentaire['ce_proposition'] != null && $nbCommentaire['ce_proposition'] != 0) {
|
493 |
if($nbCommentaire['ce_proposition'] != null && $nbCommentaire['ce_proposition'] != 0) {
|
| 491 |
$propositions[$nbCommentaire['ce_proposition']]['nb_commentaires']= $nbCommentaire;
|
494 |
$propositions[$nbCommentaires['ce_proposition']]['nb_commentaires']= $nbCommentaire;
|
| 492 |
}
|
495 |
}
|
| 493 |
}
|
496 |
}
|
| - |
|
497 |
|
| 494 |
return $propositions;
|
498 |
return $propositions;
|
| 495 |
}
|
499 |
}
|
| Line 496... |
Line 500... |
| 496 |
|
500 |
|
| 497 |
/*-------------------------------------------------------------------------------
|
501 |
/*-------------------------------------------------------------------------------
|