Subversion Repositories Sites.obs-saisons.fr

Compare Revisions

Ignore whitespace Rev 247 → Rev 248

/trunk/applications/jrest/services/OdsExport.php
279,7 → 279,7
$requete_selection_stations = 'SELECT * FROM ods_stations '.
' LEFT JOIN ods_individus '.
' ON ods_individus.oi_ce_station = ods_stations.os_id_station '.
' ORDER BY ods_stations.os_id_station, ods_individus.oi_ce_espece ';
' ORDER BY ods_stations.os_id_station, ods_individus.oi_ce_espece';
$res_selection_stations = $this->executerRequete($requete_selection_stations);
298,31 → 298,38
foreach($tableau_stations_infos as &$stations_infos) {
if($stations_infos['os_ce_commune'] == "NULL") {
$stations_infos['os_ce_commune'] = '';
if(!isset($resultats_formates[$stations_infos['os_id_station']])) {
if($stations_infos['os_ce_commune'] == "NULL") {
$stations_infos['os_ce_commune'] = '';
}
$resultats_formates[$stations_infos['os_id_station']] = array(
'station' => $stations_infos['os_nom'],
'code_commune' => $stations_infos['os_ce_commune'],
'nom_commune' => '',
'latitude' => $stations_infos['os_latitude'],
'longitude' => $stations_infos['os_longitude'],
'altitude' => $stations_infos['os_altitude'],
'id_participant' => $stations_infos['os_ce_participant'],
'pseudo_participant' => '',
'mail_participant' => '',
'especes' => array()
);
if(is_numeric($stations_infos['os_ce_commune'])) {
$codes_insee_communes[] = $stations_infos['os_ce_commune'];
}
}
$resultats_formates[$stations_infos['os_id_station']] = array(
'station' => $stations_infos['os_nom'],
'code_commune' => $stations_infos['os_ce_commune'],
'nom_commune' => '',
'latitude' => $stations_infos['os_latitude'],
'longitude' => $stations_infos['os_longitude'],
'altitude' => $stations_infos['os_altitude'],
'id_participant' => $stations_infos['os_ce_participant'],
'pseudo_participant' => '',
'mail_participant' => ''
);
$infos_espece = $especes[$stations_infos['oi_ce_espece']];
if($infos_espece['type'] != "") {
$infos_espece['type'] = $this->obtenirValeurTripleParId($infos_espece['type']);
}
$resultats_formates[$stations_infos['os_id_station']]['especes'][] = $infos_espece;
if(is_numeric($stations_infos['os_ce_commune'])) {
$codes_insee_communes[] = $stations_infos['os_ce_commune'];
if($infos_espece != null) {
if($infos_espece['type'] != "") {
$infos_espece['type'] = $this->obtenirValeurTripleParId($infos_espece['type']);
}
$resultats_formates[$stations_infos['os_id_station']]['especes'][$infos_espece['id_espece']] = $infos_espece;
}
}
338,7 → 345,13
$resultat['pseudo_participant'] = $correspondance_id_utilisateur[$resultat['id_participant']]['name'];
$resultat['mail_participant'] = $correspondance_id_utilisateur[$resultat['id_participant']]['mail'];
//TODO: selection champ infos complémentaires à transmettre
$types = array("Particulier" ,"Établissement scolaire", "Association" ,"Professionnel", "Autre","Inconnu");
if(isset($correspondance_id_utilisateur[$resultat['id_participant']]['profile_type'])) {
$resultat['type_participant'] = $correspondance_id_utilisateur[$resultat['id_participant']]['profile_type'];
} else {
$resultat['type_participant'] = "Inconnu";
}
}
return $resultats_formates;