265,6 → 265,7 |
* Charger les votes pour chaque image |
* */ |
private function chargerPropositionPlusProbable($images) { |
$this->obsIds = array(368594); |
|
$requetePropositions = 'SELECT * FROM '. |
'del_commentaire '. |
300,7 → 301,7 |
$valeur = ($vote['valeur'] == 1) ? 1 : -1; |
$votes[$vote['ce_proposition']] += is_numeric($vote['ce_utilisateur']) ? 3*$valeur : $valeur; |
} |
|
|
foreach($resultatsPropositions as $proposition) { |
$id_proposition = $proposition['id_commentaire']; |
$id_obs = $proposition['ce_observation']; |
310,9 → 311,8 |
} else { |
$score = -1; |
} |
|
|
$proposition['valeur'] = $score; |
|
if(!isset($propositions[$id_obs])) { |
$propositions[$id_obs] = $proposition; |
} else { |
335,8 → 335,8 |
if ($this->doitRemplacerObservationParProposition($propositions, $image)) { |
$id_obs = $image['id_observation']; |
$images[$id]['determination.famille'] = $propositions[$id_obs]['famille']; |
$images[$id]['determination.ns'] = $propositions[$id_obs]['nom_ret']; |
$images[$id]['determination.nn'] = $propositions[$id_obs]['nom_ret_nn']; |
$images[$id]['determination.ns'] = $propositions[$id_obs]['nom_sel']; |
$images[$id]['determination.nn'] = $propositions[$id_obs]['nom_sel_nn']; |
$images[$id]['determination.nt'] = $propositions[$id_obs]['nt']; |
} |
|
348,10 → 348,10 |
return $images; |
} |
|
private function doitRemplacerObservationParProposition($propositions, $image) { |
private function doitRemplacerObservationParProposition($propositions, $image) { |
return ((isset($propositions[$image['id_observation']]) && |
$propositions[$image['id_observation']] != null && |
$propositions[$image['id_observation']]['nom_ret_nn'] != 0) && |
$propositions[$image['id_observation']]['nom_sel_nn'] != 0) && |
($propositions[$image['id_observation']]['valeur'] > 0 || |
$image['determination.nn'] == 0) |
); |