| /trunk/services/modules/0.1/baseflor/GraphiquesBaseflor.php |
|---|
| 91,8 → 91,7 |
| public function changerValeursSVG(){ |
| $Dompath = new DOMXPath($this->dom); |
| foreach ($this->valeurs_en_pourcentage as $cle => $val) { |
| if ($val !== null) { // sinon valeur inconnue donc pas de point rouge |
| foreach ($this->valeurs_en_pourcentage as $cle => $val){ |
| $val = preg_replace('/,/','.', $val); |
| $grad_id = array_search($val,$this->graduations_id); |
| $element = $Dompath->query("//*[@id='".$grad_id."']")->item(0); |
| 104,7 → 103,6 |
| $this->ajouterInfoAuSurvol($curseur); |
| $changement = true; |
| } |
| } |
| } |
| $this->ajusterFormatSVG(); |
| 114,10 → 112,8 |
| public function ajouterInfoAuSurvol($curseur){ |
| $champs = $curseur->getAttribute('id'); |
| $valeurTexte = $this->recupererOntologies($this->valeurs_champs[$champs], $champs ); |
| if ($valeurTexte !== false) { |
| $valeurTexte = $this->traiterIntermediaires($valeurTexte->nom, $champs, $champs); |
| $curseur->setAttribute('title',$this->valeurs_champs[$champs].": ".$valeurTexte ); |
| } |
| $valeurTexte = $this->traiterIntermediaires($valeurTexte->nom, $champs, $champs); |
| $curseur->setAttribute('title',$this->valeurs_champs[$champs].": ".$valeurTexte ); |
| } |
| /trunk/services/modules/0.1/baseflor/CommunGraphiques.php |
|---|
| 52,8 → 52,7 |
| $resultats = ''; |
| $this->traiterRessources(); |
| $req = $this->assemblerLaRequete(); |
| $resultat = $this->resultat = $this->Bdd->recupererTous($req); |
| $resultat = $this->resultat = $this->Bdd->recupererTous($this->assemblerLaRequete()); |
| $versionResultat = $this->obtenirResultat($resultat); |
| return $versionResultat; |
| } |
| 232,7 → 231,7 |
| if ((count($this->ressources)) != 0) { |
| //$Atraiter = array_filter($resultat[0],function($var){return ($var != '');}); |
| foreach ($resultat[0] as $champs => $valeur) { |
| if ($valeur !== null) { |
| if ($valeur !== '') { |
| $Atraiter[$champs] = $valeur; |
| } |
| } |
| 259,13 → 258,10 |
| public function traiterValeursEcologiques($valeur) { |
| public function traiterValeursEcologiques($valeur){ |
| $this->valeurs_champs = $valeur; |
| foreach($this->valeurs_champs as $cle => $val){ |
| if ($val === null) { |
| $this->valeurs_en_pourcentage[$cle] = null; |
| } else { |
| if (preg_match("/ve_humidite_edaph/", $cle)) { |
| $this->valeurs_en_pourcentage[$cle] = round($val/13,1); |
| } elseif (preg_match("/ve_salinite/", $cle)) { |
| 273,7 → 269,6 |
| } else { |
| $this->valeurs_en_pourcentage[$cle] = round($val/10,1); |
| } |
| } |
| } |
| } |
| 317,7 → 312,7 |
| $this->champs_ontologiques[$champs]), |
| Bdd::MODE_OBJET); |
| } catch (Exception $e) { |
| $val = false; |
| $val = ""; |
| } |
| return $val; |
| } |