48,11 → 48,11 |
// @TODO faire mieux ! |
foreach ($pso as $i => &$images) { |
foreach ($images as $j => &$image) { |
$pso[$i][$j]['observation']['station'] = str_replace('"', '', $image['observation']['station']); |
$pso[$i][$j]['observation']['lieudit'] = str_replace('"', '', $image['observation']['lieudit']); |
$pso[$i][$j]['observation']['milieu'] = str_replace('"', '', $image['observation']['milieu']); |
$pso[$i][$j]['station.station'] = str_replace('"', '', $image['station.station']); |
$pso[$i][$j]['station.libelle'] = str_replace('"', '', $image['station.libelle']); |
$pso[$i][$j]['observation']['station'] = str_replace('"', '', isset($image['observation']['station']) ? $image['observation']['station'] : ''); |
$pso[$i][$j]['observation']['lieudit'] = str_replace('"', '', isset($image['observation']['lieudit']) ? $image['observation']['lieudit'] : ''); |
$pso[$i][$j]['observation']['milieu'] = str_replace('"', '', isset($image['observation']['milieu']) ? $image['observation']['milieu'] : ''); |
$pso[$i][$j]['station.station'] = str_replace('"', '', isset($image['station.station']) ? $image['station.station'] : ''); |
$pso[$i][$j]['station.libelle'] = str_replace('"', '', isset($image['station.libelle']) ? $image['station.libelle'] : ''); |
} |
} |
|
103,28 → 103,28 |
return $this->donnees; |
} |
|
public function obtenirPhotoCelTpl() { |
public function obtenirPhotoCelTpl() { |
$images = $this->initialiserPhotos('cel'); |
$this->formaterListePhotos('cel', $images); |
$this->formaterMetaPhotos('cel'); |
$chemin_sous_squelette = Config::get('chemin_modules').AppControleur::getNomDossierDepuisClasse('Fiche').DS.Config::get('dossier_squelettes').DS; |
$donnees = array('cel' => array('images' => $this->donnees['cel']['images'], 'meta' => $this->donnees['cel']['meta'] )); |
$html_tpl = $this->getVue($chemin_sous_squelette.'fiche_illustrations_cel.tpl.html', $donnees); |
return $html_tpl; |
$html_tpl = $this->getVue($chemin_sous_squelette.'fiche_illustrations_cel.tpl.html', $donnees); |
return $html_tpl; |
} |
|
//TODO: factoriser les deux fonctions ci dessous et ci dessus |
public function obtenirTranchesCelTpl($projet) { |
// On ne prend que la tranche des images (12) |
$images = $this->initialiserTranchePhotos($projet); |
$this->formaterListePhotos($projet, $images); |
$this->formaterMetaPhotos($projet); |
$chemin_sous_squelette = Config::get('chemin_modules').AppControleur::getNomDossierDepuisClasse('Fiche').DS.Config::get('dossier_squelettes').DS; |
$donnees = array('cel' => array('images' => $this->donnees['cel']['images'], 'meta' => $this->donnees[$projet]['meta'] )); |
$html_tpl = $this->getVue($chemin_sous_squelette.'fiche_illustrations_cel.tpl.html', $donnees); |
// On ne prend que la tranche des images (12) |
$images = $this->initialiserTranchePhotos($projet); |
$this->formaterListePhotos($projet, $images); |
$this->formaterMetaPhotos($projet); |
$chemin_sous_squelette = Config::get('chemin_modules').AppControleur::getNomDossierDepuisClasse('Fiche').DS.Config::get('dossier_squelettes').DS; |
$donnees = array('cel' => array('images' => $this->donnees['cel']['images'], 'meta' => $this->donnees[$projet]['meta'] )); |
$html_tpl = $this->getVue($chemin_sous_squelette.'fiche_illustrations_cel.tpl.html', $donnees); |
$this->donnees[$projet]['illustrationsCel'] = $html_tpl; |
$this->donnees[$projet]['cel_present'] = count($images) > 0; |
// Ensuite on fait juste un lien qui permettra de les charger |
$this->donnees[$projet]['cel_present'] = count($images) > 0; |
// Ensuite on fait juste un lien qui permettra de les charger |
$this->donnees[$projet]['ajax_url'] = $this->formaterUrlAjaxPhotoCel(); |
} |
|
185,8 → 185,8 |
$this->obtenirTranchesCelTpl($projet); |
} else { |
$this->images->setApi(Eflore::API_EFLORE); |
$images = $this->initialiserPhotos($projet); |
$this->formaterListePhotos($projet, $images); |
$images = $this->initialiserPhotos($projet); |
$this->formaterListePhotos($projet, $images); |
$this->formaterMetaPhotos($projet); |
} |
} |
256,11 → 256,11 |
if (! empty($infosCaracteres) && ! empty($infosCaracteres[''])) { // le tag est vide, ici |
$caracteres = $infosCaracteres['']; |
} |
foreach($caracteres as $id_image => &$caractere) { |
$caractere['urlDetailImg'] = $this->appUrls->obtenirUrlPopUpIllustrations($id_image); |
$caractere['urlImgGrandFormat'] = $this->obtenirUrlImageGrandFormatCel($id_image); |
$caractere['urlContact'] = $this->appUrls->obtenirUrlPopUpContact($caractere['auteur.id'], $id_image); |
$caractere['urlProfil'] = $this->appUrls->obtenirUrlProfilAnnuaire($caractere['auteur.id']); |
foreach($caracteres as $id_image => &$caractere) { |
$caractere['urlDetailImg'] = $this->appUrls->obtenirUrlPopUpIllustrations($id_image); |
$caractere['urlImgGrandFormat'] = $this->obtenirUrlImageGrandFormatCel($id_image); |
$caractere['urlContact'] = $this->appUrls->obtenirUrlPopUpContact($caractere['auteur.id'], $id_image); |
$caractere['urlProfil'] = $this->appUrls->obtenirUrlProfilAnnuaire($caractere['auteur.id']); |
$caractere['urlMauvaiseIdentification'] = $this->appUrls->obtenirUrlMauvaiseIdentification($caractere['observation']['id_observation']); |
} |
$this->donnees['caracteres'] = $caracteres; |
284,23 → 284,23 |
$ret = $this->images->getInfosImagesParIdsNoms(array($nnr)); |
return $ret; |
} |
|
private function initialiserTranchePhotos($projet) { |
$this->images->setProjet($projet); |
$nnr = $this->nomCourant->getNnr(); |
$ret = $this->images->getInfosTrancheImagesParIdsNoms(array($nnr), Config::get('nbTrancheImagesResultatsDeterminationAffichees')); |
return $ret; |
|
private function initialiserTranchePhotos($projet) { |
$this->images->setProjet($projet); |
$nnr = $this->nomCourant->getNnr(); |
$ret = $this->images->getInfosTrancheImagesParIdsNoms(array($nnr), Config::get('nbTrancheImagesResultatsDeterminationAffichees')); |
return $ret; |
} |
|
private function formaterListePhotos($projet, $images) { |
foreach ($images as $idImg => $img) { |
$infosImg = array(); |
$infosImg['src'] = $img['binaire.href']; |
$infosImg['nomSci'] = $img['determination.nom_sci']; |
$infosImg['station'] = $img['station.libelle']; |
$infosImg['src'] = isset($img['binaire.href']) ? $img['binaire.href'] : null; |
$infosImg['nomSci'] = isset($img['determination.nom_sci']) ? $img['determination.nom_sci'] : null; |
$infosImg['station'] = isset($img['station.libelle']) ? $img['station.libelle'] : null; |
$infosImg['date'] = $this->formaterDateImg($img['date']); |
$infosImg['auteur'] = $img['auteur.libelle']; |
$infosImg['auteur.id'] = $img['auteur.id']; |
$infosImg['auteur'] = isset($img['auteur.libelle']) ? $img['auteur.libelle'] : null; |
$infosImg['auteur.id'] = isset($img['auteur.id']) ? $img['auteur.id'] : null; |
if ($projet == "cel") { |
$infosImg['urlDetailImg'] = $this->appUrls->obtenirUrlPopUpIllustrations($idImg); |
$infosImg['urlImgGrandFormat'] = $this->obtenirUrlImageGrandFormatCel($idImg); |
318,8 → 318,8 |
} |
|
// XXX: public static pour ĂȘtre injectĂ© dans le squelette d'entete |
public static function obtenirTemplateUrlImageGrandFormatOrganes($format = "O") { |
return $tpl = sprintf(Config::get('baseUrlImageCelTpl').$format.'.jpg', '{id_image}'); |
public static function obtenirTemplateUrlImageGrandFormatOrganes($format = "O") { |
return $tpl = sprintf(Config::get('baseUrlImageCelTpl').$format.'.jpg', '{id_image}'); |
} |
|
private function formaterMetaPhotos($projet) { |