| 67,17 → 67,13 |
|---|
| |
| private function chargerNomenclature() { |
| $this->donnees['selectionne'] = $this->taxonDao->getNomenclature($this->referentiel, $this->donnees['num_nom']); |
| if (strpos($this->donnees['nom'], ' x ') ) { |
| if ($this->donnees['num_nom'] != $this->donnees['num_nom_retenu'] && $this->donnees['num_nom_retenu'] != '') { |
| $this->donnees['retenu'] = $this->taxonDao->getNomenclature($this->referentiel, $this->donnees['num_nom_retenu']); |
| $this->donnees['parents'] = $this->taxonDao->getParentsHybride($this->referentiel, $this->donnees['num_nom_retenu']); |
| } else { |
| $this->donnees['parents'] = $this->taxonDao->getParentsHybride($this->referentiel, $this->donnees['num_nom']); |
| } |
| } else { |
| if ($this->donnees['num_nom'] != $this->donnees['num_nom_retenu'] && $this->donnees['num_nom_retenu'] != '') { |
| $this->donnees['retenu'] = $this->taxonDao->getNomenclature($this->referentiel, $this->donnees['num_nom_retenu']); |
| } |
| if ($this->donnees['num_nom'] != $this->donnees['num_nom_retenu'] && $this->donnees['num_nom_retenu'] != '') { |
| $this->donnees['retenu'] = $this->taxonDao->getNomenclature($this->referentiel, $this->donnees['num_nom_retenu']); |
| } |
| if ($this->donnees['info']['hybride_parent_01'] != '' && $this->donnees['info']['hybride_parent_02'] != '') { |
| $this->donnees['parents'] = $this->taxonDao->getParentsHybride($this->referentiel, $this->donnees['num_nom']); |
| } elseif ($this->donnees['info']['hybride_parent_01'] != '' || $this->donnees['info']['hybride_parent_02'] != ''){ |
| $this->donnees['parents'] = $this->taxonDao->getParentsHybride($this->referentiel, $this->donnees['num_nom']); |
| } |
| } |
| |
| 205,19 → 201,17 |
|---|
| private function chargerClassification() { |
| $this->chargerTableauManuel('signification_rang'); |
| $this->donnees['valeur_rang'] = $this->tableau_manuel['signification_rang']; |
| if ($this->donnees['info']['num_tax_sup'] != '' || isset($this->donnees['retenu']['num_tax_sup'])) { |
| if ($this->donnees['num_nom'] == $this->donnees['num_nom_retenu']) { |
| $this->donnees['classification']['supérieurs'] = array_reverse($this->taxonDao->getClassification |
| ('Superieur', $this->referentiel, $this->donnees['info']['num_tax_sup'])); |
| } else { |
| $this->donnees['classification']['supérieurs'] = array_reverse($this->taxonDao->getClassification |
| if ($this->donnees['info']['num_tax_sup'] != '' && $this->donnees['info']['num_tax_sup'] !== "0") { |
| $this->donnees['classification']['supérieurs'] = array_reverse($this->taxonDao->getClassification |
| ('Superieur', $this->referentiel, $this->donnees['info']['num_tax_sup'])); |
| } elseif (isset($this->donnees['retenu']['num_tax_sup']) && ($this->donnees['retenu']['num_tax_sup'] != '')) { |
| $this->donnees['classification']['supérieurs'] = array_reverse($this->taxonDao->getClassification |
| ('Superieur', $this->referentiel, $this->donnees['retenu']['num_tax_sup'])); |
| } |
| } |
| if ($this->donnees['num_nom_retenu'] != '') { |
| $class_inf = $this->taxonDao->getClassification |
| ('Inferieur', $this->referentiel, $this->donnees['num_nom_retenu']); |
| if ($class_inf != '') { |
| if ($class_inf != '') { |
| $this->donnees['classification']['inférieurs'] = $class_inf['inf']; |
| $this->donnees['niveau'] = $class_inf['niveau']; |
| } |