Subversion Repositories Applications.referentiel

Compare Revisions

Ignore whitespace Rev 240 → Rev 241

/trunk/interfaces/squelettes/fiche_taxon.tpl.html
586,7 → 586,14
<table>
<thead>
<tr>
<th <?=($type == 'inférieurs') ? 'colspan="'.$niveau.'"' : '' ?>>Taxons <?=$type;?></th>
<th <?=($type == 'inférieurs') ? 'colspan="'.$niveau.'"' : '' ?>>
Taxons <?=$type;?>
<? if ($type == 'inférieurs') : ?><br />
(<? foreach ($noms_rang as $rang => $nb_noms) : ?>
<?= $nb_noms.' '.$valeur_rang[$rang].'s ';?>
<? endforeach; ?>)
<? endif; ?>
</th>
<th class="vide" colspan="6">&nbsp;</th>
</tr>
<tr>
/trunk/interfaces/controleurs/FicheTaxon.php
217,7 → 217,9
if ($class_inf != '') {
$this->donnees['classification']['inférieurs'] = $class_inf['inf'];
$this->donnees['niveau'] = $class_inf['niveau'];
}
arsort($class_inf['nb_par_rang']);
$this->donnees['noms_rang'] = $class_inf['nb_par_rang'];
}
}
}
/trunk/services/modules/FicheTaxon.php
191,15 → 191,23
foreach ($donnees as $donnee) {
$this->resultat['inf'][$donnee['num_nom']] = $donnee;
$this->resultat['inf'][$donnee['num_nom']]['niveau'] = $niveau;
$this->resultat['nb_par_rang'][$donnee['rang']] =
(isset($this->resultat['nb_par_rang'][$donnee['rang']])) ?
$this->resultat['nb_par_rang'][$donnee['rang']] + 1
: 1;
}
} elseif (count($donnees) >= 100 ||
(isset($this->resultat['inf']) && count($this->resultat['inf'])+count($donnees) >= 100)) {
if ((isset($this->resultat['niveau']) && $niveau > $this->resultat['niveau']) || !isset($this->resultat['niveau'])) {
$this->resultat['niveau'] = $niveau;
$this->resultat['nb_niveau'][$niveau] = count($donnees);
}
foreach ($donnees as $donnee) {
$this->resultat['inf'][$donnee['num_nom']] = $donnee;
$this->resultat['inf'][$donnee['num_nom']]['niveau'] = $niveau;
$this->resultat['nb_par_rang'][$donnee['rang']] =
(isset($this->resultat['nb_par_rang'][$donnee['rang']])) ?
$this->resultat['nb_par_rang'][$donnee['rang']] + 1
: 1;
}
} else {
if ((isset($this->resultat['niveau']) && $niveau > $this->resultat['niveau']) || !isset($this->resultat['niveau'])) {
210,6 → 218,10
$this->resultat['inf'][$donnee['num_nom']] = $donnee;
$this->resultat['inf'][$donnee['num_nom']]['niveau'] = $niveau - 1;
$this->getElementTaxonInferieur($ref, $donnee['num_nom'], $niveau);
$this->resultat['nb_par_rang'][$donnee['rang']] =
(isset($this->resultat['nb_par_rang'][$donnee['rang']])) ?
$this->resultat['nb_par_rang'][$donnee['rang']] + 1
: 1;
}
}
} catch (PDOException $e) {