35,7 → 35,7 |
} |
|
public function getExportObservation($start = null,$limit = null, $order_by = 'oo_date') { |
|
|
$requete_selection_observations = 'SELECT * FROM ods_observations '. |
' LEFT JOIN ods_individus '. |
' ON oi_id_individu = oo_ce_individu'. |
94,8 → 94,13 |
} |
|
$condition = rtrim($condition,'AND '); |
$condition .= ' AND oo_ce_participant != 4'; |
|
$id_demo = $this->config['appli']['id_participant_demo']; |
$id_admin = $this->config['appli']['id_participant_admin']; |
|
$condition .= ' AND oo_ce_participant != '.$id_demo; |
$condition .= ' AND oo_ce_participant != '.$id_admin; |
|
return $condition; |
} |
|
177,6 → 182,7 |
|
$gestionnaire_especes = new OdsEspece($this->config); |
$gestionnaire_communes = new OdsCommune($this->config); |
$gestionnaire_utilisateurs = new OdsUtilisateur($this->config); |
|
$especes = $gestionnaire_especes->getToutesEspeces(); |
$evenements = $this->obtenirValeursListeParAbreviation(self::ABBR_LISTE_EVENEMENTS); |
212,7 → 218,9 |
'longitude' => $observations_infos['os_longitude'], |
'altitude' => $observations_infos['os_altitude'], |
'milieu' => $observations_infos['os_milieu'], |
'participant' => $observations_infos['os_ce_participant'] |
'id_participant' => $observations_infos['os_ce_participant'], |
'pseudo_participant' => '', |
'mail_participant' => '' |
); |
|
$resultats_formates[] = $infos_formatees; |
223,13 → 231,16 |
} |
|
$correspondance_codes_insee_noms = $gestionnaire_communes->obtenirTableauNomsCommunesParTableauCodesInsee($codes_insee_communes); |
$correspondance_id_utilisateur = $gestionnaire_utilisateurs->getListeUtilisateurFormateeId(); |
|
foreach($resultats_formates as &$resultat) { |
|
if(isset($correspondance_codes_insee_noms[$resultat['code_commune']]) && trim($correspondance_codes_insee_noms[$resultat['code_commune']]) != '') { |
|
if(isset($correspondance_codes_insee_noms[$resultat['code_commune']]) && trim($correspondance_codes_insee_noms[$resultat['code_commune']]) != '') { |
$resultat['nom_commune'] = $correspondance_codes_insee_noms[$resultat['code_commune']]; |
} |
|
$resultat['pseudo_participant'] = $correspondance_id_utilisateur[$resultat['id_participant']]['name']; |
$resultat['mail_participant'] = $correspondance_id_utilisateur[$resultat['id_participant']]['mail']; |
} |
|
return $resultats_formates; |