Subversion Repositories eFlore/Applications.eflore-consultation

Compare Revisions

Regard whitespace Rev 956 → Rev 957

/trunk/modules/fiche/squelettes/fiche_ecologie.tpl.html
1,5 → 1,5
<div id="ecologie">
 
<?php if(isset($baseflor)) : ?>
<h2>Optimum écologique</h2>
<? if (!isset($baseflor['aucune'])) : ?>
<div class="fond_graphique">
157,10 → 157,10
<?=$baseflor['aucune']?>
<br />
<? endif; ?>
<? endif; ?>
<?php if(isset($baseflor)) : ?>
<h2>Phytosociologie</h2>
<? if (isset($baseveg['syntaxons-sup']) || isset($baseveg['syntaxons-sup'])) : ?>
<br/>
219,6 → 219,7
Aucune Donnée.
<? endif; ?>
<br/>
<?php endif; ?>
 
<br/>
<br/>
/trunk/modules/fiche/formateurs/Ecologie.php
15,9 → 15,13
*/
class Ecologie extends aControleur {
private $referentiel = 'bdtfx';
private $donnees = array();
public function __construct(Conteneur $conteneur) {
$this->conteneur = $conteneur;
$this->nomCourant = $this->conteneur->getNomCourant();
$this->referentiel = $this->conteneur->getParametre('referentiel');
$this->informations = $this->conteneur->getApiInformations();
$this->meta = $this->conteneur->getApiMetaDonnees();
$this->wikini = $this->conteneur->getApiWikini();
30,19 → 34,19
public function obtenirDonnees() {
$donnees = array();
$donnees['wikini'] = $this->getWikini();
$donnees['baseflor'] = $this->getBaseflor();
$donnees['baseveg'] = $this->getBaseveg();
$donnees['urls'] = $this->appUrls;
return $donnees;
$this->getWikini();
$this->getBaseflor();
$this->getBaseveg();
$this->donnees['urls'] = $this->appUrls;
return $this->donnees;
}
public function obtenirDonneesExport() {
$donnees = array();
$donnees['wikini'] = $this->getWikini();
$donnees['baseflor'] = $this->getBaseflorExport();
$donnees['baseveg'] = $this->getBaseveg();
return $donnees;
$this->getWikini();
$this->getBaseflorExport();
$this->getBaseveg();
return $this->donnees;
}
public function getBaseflorCatminat($depart, $limite) {
63,6 → 67,7
}
private function getBaseveg() {
if (Config::get($this->referentiel.'.basePhytosocio') != "") {
$baseveg = array();
$baseflor = $this->getBaseflorCatminat(0,500);
$baseveg['baseflor'] = $baseflor;
90,8 → 95,9
}else {
$baseveg['aucune'] = 'Aucunes données';
}
return $baseveg;
$this->donnees['baseveg'] = $baseveg;
}
}
private function getBasevegSyntaxonCourant() {
$baseveg = array();
106,8 → 112,6
return $baseveg;
}
private function getWikini() {
$wikini = array();
$wikini['titre'] = 'Wikini';
115,15 → 119,17
$num_tax = $this->nomCourant->getNomSelectionne()->get('num_taxonomique');
$page_wiki = $this->wikini->getPageWikiPourRefEtNumTax($referentiel, $num_tax);
$wikini['ecologie'] = $this->wikini->getTexteFormate($page_wiki, 'ecologie');
return $wikini;
$this->donnees['wikini'] = $wikini;
}
public function getBloc() {
$donnees = array();
$donnees['graph'] = $this->getBaseflor(false);
$donnees['graph']['titre'] = 'Optimum écologique';
$donnees['phytosocio'] = $this->getBasevegSyntaxonCourant();
return $donnees;
$this->getBaseflor(false);
$this->donnees['graph'] = $this->donnees['baseflor'];
$this->donnees['graph']['titre'] = 'Optimum écologique';
$this->donnees['phytosocio'] = $this->getBasevegSyntaxonCourant();
return $this->donnees;
}
private function getBaseflorExport() {
150,6 → 156,7
}
private function getBaseflor($inclure_legende = true) {
if (Config::get($this->referentiel.'.baseEcologie') != "") {
$num_nom = $this->nomCourant->getNns();
$cache = $this->obtenirCache('baseflor_graphique_'.$num_nom);
if($cache != null) {
194,7 → 201,8
$baseflor['aucune'] = 'Aucunes données';
}
}
return $baseflor;
$this->donnees['baseflor'] = $baseflor;
}
}
}
?>
/trunk/modules/fiche/formateurs/Description.php
70,6 → 70,34
return method_exists($this, 'get'.$base);
}
 
public function getBloc() {
// prend la première description disponible dans l'ordre indiqué dans le fichier
// de config, et prend la description wiki sinon
if(Config::get($this->referentiel.'.baseDescription') != "") {
$bases_descriptions = Config::get($this->referentiel.'.baseDescription');
$bases_descriptions = explode(',',$bases_descriptions);
foreach($bases_descriptions as $base) {
if($this->aMethodeDescription($base)) {
$fonction = 'get'.ucfirst($base);
$this->$fonction();
if(!empty($this->donnees[$base]['description'])) {
$this->donnees['titre'] = "Description de ".ucfirst($base);
$this->donnees['description'] = $this->donnees[$base]['description'];
break;
}
}
}
}
if (empty($this->donnees['description'])) {
$description = $this->getWikini();
$this->donnees['description'] = $description['description'];
$this->donnees['titre'] = "Description collaborative";
}
return $this->donnees;
}
 
private function getBaseflor() {
$baseflor = array();
$this->informations ->setProjet('baseflor');
113,22 → 141,6
return $chaine;
}
 
 
public function getBloc() {
$description = $this->getCoste();
$donnees['titre'] = "Description de Coste";
if (empty($description['description'])) {
$description = $this->getBaseflor(false);
$donnees['titre'] = "Description Baseflor";
}
if (empty($description['description'])) {
$description = $this->getWikini();
$donnees['titre'] = "Description collaborative";
}
$donnees['description'] = $description['description'];
return $donnees;
}
 
public function getWikipedia() {
$wp = array();
$this->textes->setProjet('wikipedia');
245,7 → 257,5
}
}
}
 
 
}
?>