Subversion Repositories Applications.referentiel

Rev

Rev 149 | Rev 204 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 149 Rev 168
Line 65... Line 65...
65
		}
65
		}
66
	}
66
	}
Line 67... Line 67...
67
	
67
	
68
	private function chargerNomenclature() {
68
	private function chargerNomenclature() {
69
		$this->donnees['selectionne'] = $this->taxonDao->getNomenclature($this->referentiel, $this->donnees['num_nom']);
-
 
70
		if (strpos($this->donnees['nom'], ' x ') ) {
69
		$this->donnees['selectionne'] = $this->taxonDao->getNomenclature($this->referentiel, $this->donnees['num_nom']);
71
			if ($this->donnees['num_nom'] != $this->donnees['num_nom_retenu'] && $this->donnees['num_nom_retenu'] != '') {
70
		if ($this->donnees['num_nom'] != $this->donnees['num_nom_retenu'] && $this->donnees['num_nom_retenu'] != '') {
-
 
71
			$this->donnees['retenu'] = $this->taxonDao->getNomenclature($this->referentiel, $this->donnees['num_nom_retenu']);
72
				$this->donnees['retenu'] = $this->taxonDao->getNomenclature($this->referentiel, $this->donnees['num_nom_retenu']);
72
		} 
73
				$this->donnees['parents'] = $this->taxonDao->getParentsHybride($this->referentiel, $this->donnees['num_nom_retenu']);
-
 
74
			} else {
73
		if ($this->donnees['info']['hybride_parent_01'] != '' && $this->donnees['info']['hybride_parent_02'] != '') {
75
				$this->donnees['parents'] = $this->taxonDao->getParentsHybride($this->referentiel, $this->donnees['num_nom']);
-
 
76
			}	
-
 
77
		} else {
74
			$this->donnees['parents'] = $this->taxonDao->getParentsHybride($this->referentiel, $this->donnees['num_nom']);
78
			if ($this->donnees['num_nom'] != $this->donnees['num_nom_retenu'] && $this->donnees['num_nom_retenu'] != '') {
75
		} elseif ($this->donnees['info']['hybride_parent_01'] != '' || $this->donnees['info']['hybride_parent_02'] != ''){
79
				$this->donnees['retenu'] = $this->taxonDao->getNomenclature($this->referentiel, $this->donnees['num_nom_retenu']);
-
 
80
			}
76
			$this->donnees['parents'] = $this->taxonDao->getParentsHybride($this->referentiel, $this->donnees['num_nom']);
81
		}
77
		}
Line 82... Line 78...
82
	}
78
	}
83
	
79
	
Line 203... Line 199...
203
	}
199
	}
Line 204... Line 200...
204
	
200
	
205
	private function chargerClassification() {
201
	private function chargerClassification() {
206
		$this->chargerTableauManuel('signification_rang');
202
		$this->chargerTableauManuel('signification_rang');
207
		$this->donnees['valeur_rang'] = $this->tableau_manuel['signification_rang'];
203
		$this->donnees['valeur_rang'] = $this->tableau_manuel['signification_rang'];
208
		if ($this->donnees['info']['num_tax_sup'] != '' || isset($this->donnees['retenu']['num_tax_sup'])) {
-
 
209
			if ($this->donnees['num_nom'] == $this->donnees['num_nom_retenu']) {
204
		if ($this->donnees['info']['num_tax_sup'] != '' && $this->donnees['info']['num_tax_sup'] !== "0") {
210
				$this->donnees['classification']['supérieurs'] = array_reverse($this->taxonDao->getClassification
205
			$this->donnees['classification']['supérieurs'] = array_reverse($this->taxonDao->getClassification
211
					('Superieur', $this->referentiel, $this->donnees['info']['num_tax_sup']));
-
 
-
 
206
				('Superieur', $this->referentiel, $this->donnees['info']['num_tax_sup']));
212
			} else {
207
		} elseif (isset($this->donnees['retenu']['num_tax_sup']) && ($this->donnees['retenu']['num_tax_sup'] != '')) {
213
				$this->donnees['classification']['supérieurs'] = array_reverse($this->taxonDao->getClassification
208
			$this->donnees['classification']['supérieurs'] = array_reverse($this->taxonDao->getClassification
214
				('Superieur', $this->referentiel, $this->donnees['retenu']['num_tax_sup']));
-
 
215
			}		
209
				('Superieur', $this->referentiel, $this->donnees['retenu']['num_tax_sup']));
216
		}	
210
		}	
217
		if ($this->donnees['num_nom_retenu'] != '') {
211
		if ($this->donnees['num_nom_retenu'] != '') {
218
			$class_inf = $this->taxonDao->getClassification
212
			$class_inf = $this->taxonDao->getClassification
219
				('Inferieur', $this->referentiel, $this->donnees['num_nom_retenu']);
213
				('Inferieur', $this->referentiel, $this->donnees['num_nom_retenu']);
220
			if ($class_inf != '') {	
214
			if ($class_inf != '') {
221
				$this->donnees['classification']['inférieurs'] = $class_inf['inf'];	
215
				$this->donnees['classification']['inférieurs'] = $class_inf['inf'];	
222
				$this->donnees['niveau'] = $class_inf['niveau'];
216
				$this->donnees['niveau'] = $class_inf['niveau'];
223
			}	
217
			}	
224
		}	
218
		}