Subversion Repositories Sites.obs-saisons.fr

Compare Revisions

Ignore whitespace Rev 69 → Rev 70

/trunk/applications/saisie/controleurs/Station.php
23,7 → 23,9
public function initialiser() {
$this->id_station_en_cours = $_GET['id_station'];
if(isset($_GET['id_station'])) {
$this->id_station_en_cours = $_GET['id_station'];
}
$this->setNavigation();
}
124,10 → 126,9
// +---------------------------------------------------------------------------------------------------------------+
// METHODES POUR FABRIQUER LE MENU
public function construireMenuNavigation($espece_en_cours = null) {
public function construireMenuNavigation($id_espece_en_cours = null) {
$id_station_en_cours = $this->id_station_en_cours;
$id_espece_en_cours = null;
if(isset($_GET['id_espece'])) {
$id_espece_en_cours = $_GET['id_espece'];
138,7 → 139,7
foreach($stations as &$station) {
$station['url'] = Liens::instance()->getUrlConsultationFicheStation($station['id']);
$station['url'] = Liens::getUrlConsultationFicheStation($station['id']);
}
if($id_station_en_cours != null) {
145,7 → 146,7
$especes_station_en_cours = $this->getEspecesStation($id_station_en_cours);
foreach($especes_station_en_cours as &$espece) {
$espece['url'] = Liens::instance()->getUrlConsultationEspeceStation($id_station_en_cours, $espece['id_espece']);
$espece['url'] = Liens::getUrlConsultationEspeceStation($id_station_en_cours, $espece['id_espece']);
}
$stations[$id_station_en_cours]['especes'] = $especes_station_en_cours;
}
152,11 → 153,9
$donnees['stations'] = $stations;
$donnees['id_station_en_cours'] = $id_station_en_cours;
 
$donnees['id_espece_en_cours'] = $id_espece_en_cours;
if($id_espece_en_cours != null) {
$donnees['id_espece_en_cours'] = $id_espece_en_cours;
}
$menu_navigation = $this->getVue('navigation/menu', $donnees);
return $menu_navigation;
208,4 → 207,5
return $liste_individus;
}
}
}
?>
/trunk/applications/saisie/controleurs/Liens.php
13,31 → 13,8
* @version SVN: $Id: Fiche.php 152 2010-09-06 16:19:12Z jpm $
*/
class Liens extends aControleur {
private static $inclusion_scripts = null;
private static $inclusion_styles = null ;
private static $self;
public function __construct() {
parent::__construct();
self::$inclusion_scripts = array();
self::$inclusion_styles = array();
 
}
public static function instance() {
if (empty(self::$self)) {
self::$self = new Liens();
}
return self::$self;
}
 
public function construireUrl($tableau_params, $conserver_parametres_actuels = false) {
public static function construireUrl($tableau_params, $conserver_parametres_actuels = false) {
if ($conserver_parametres_actuels) {
return '?'.http_build_query($tableau_params + $_GET);
45,33 → 22,33
return '?'.http_build_query($tableau_params);
}
public function getUrlSquelette() {
public static function getUrlSquelette() {
$url_base = self::instance()->getUrlBaseComplete();
$url_base = self::getUrlBaseComplete();
$url_base_squelette = $url_base.Config::get('dossier_squelettes').DS;
return $url_base_squelette;
}
public function getUrlStyle() {
$url_base_style = self::instance()->getUrlSquelette().'css'.DS;
public static function getUrlStyle() {
$url_base_style = self::getUrlSquelette().'css'.DS;
return $url_base_style;
}
public function getUrlScript() {
$url_base_script = self::instance()->getUrlSquelette().'js'.DS;
public static function getUrlScript() {
$url_base_script = self::getUrlSquelette().'js'.DS;
return $url_base_script;
}
public function getUrlImage() {
$url_base_image = self::instance()->getUrlSquelette().'images'.DS;
public static function getUrlImage() {
$url_base_image = self::getUrlSquelette().'images'.DS;
return $url_base_image;
}
public function getUrlBaseReecrite() {
public static function getUrlBaseReecrite() {
if(isset($_SERVER['REDIRECT_URL']) && $_SERVER['REDIRECT_URL'] != '') {
83,7 → 60,7
return $base_vrai_chemin;
}
public function getUrlBase() {
public static function getUrlBase() {
$base_vrai_chemin = str_replace(realpath($_SERVER['DOCUMENT_ROOT']),'',realpath(Application::getChemin()));
$base_vrai_chemin .= '/';
91,11 → 68,11
return $base_vrai_chemin;
}
public function getUrlBaseComplete() {
public static function getUrlBaseComplete() {
return 'http://'.$_SERVER['SERVER_NAME'].str_replace(realpath($_SERVER['DOCUMENT_ROOT']),'',realpath(Application::getChemin())).'/';
}
public function getUrlConsultationFicheStation($id_station) {
public static function getUrlConsultationFicheStation($id_station) {
$params = array(
'module' => 'Station',
102,10 → 79,10
'action' => 'afficherInformationsStation',
'id_station' => $id_station
);
return self::instance()->construireUrl($params);
return self::construireUrl($params);
}
public function getUrlFormulaireSaisieStation() {
public static function getUrlFormulaireSaisieStation() {
$params = array(
'module' => 'Station',
112,27 → 89,27
'action' => 'afficherFormulaireSaisieStation',
'id_station' => 'saisie'
);
return self::instance()->construireUrl($params);
return self::construireUrl($params);
}
public function getUrlValidationFormulaireSaisieStation() {
public static function getUrlValidationFormulaireSaisieStation() {
$params = array(
'module' => 'Station',
'action' => 'validerFormulaireSaisieStation'
);
return self::instance()->construireUrl($params);
return self::construireUrl($params);
}
public function getUrlFormulaireModificationStation($id_station) {
public static function getUrlFormulaireModificationStation($id_station) {
$params = array(
'module' => 'Station',
'action' => 'afficherFormulaireModificationStation',
'id_station' => $id_station
);
return self::instance()->construireUrl($params);
return self::construireUrl($params);
}
public function getUrlFormulaireAjoutEspece($id_station) {
public static function getUrlFormulaireAjoutEspece($id_station) {
 
$params = array(
'module' => 'Espece',
141,10 → 118,10
'id_espece' => 'saisie'
);
return self::instance()->construireUrl($params);
return self::construireUrl($params);
}
public function getUrlValidationFormulaireSaisieEspece($id_station) {
public static function getUrlValidationFormulaireSaisieEspece($id_station) {
$params = array(
'module' => 'Espece',
153,10 → 130,10
'id_espece' => 'saisie'
);
return self::instance()->construireUrl($params);
return self::construireUrl($params);
}
public function getUrlConsultationFicheIndividu($id_station, $id_espece, $id_individu) {
public static function getUrlConsultationFicheIndividu($id_station, $id_espece, $id_individu) {
 
$params = array(
'module' => 'Individu',
165,11 → 142,11
'id_espece' => $id_espece,
'id_individu' => $id_individu
);
return self::instance()->construireUrl($params);
return self::construireUrl($params);
}
public function getUrlFormulaireSaisieIndividu($id_station, $id_espece) {
public static function getUrlFormulaireSaisieIndividu($id_station, $id_espece) {
$params = array(
'module' => 'Individu',
177,10 → 154,10
'id_station' => $id_station,
'id_espece' => $id_espece
);
return self::instance()->construireUrl($params);
return self::construireUrl($params);
}
public function getUrlValidationFormulaireSaisieIndividu($id_station, $id_espece) {
public static function getUrlValidationFormulaireSaisieIndividu($id_station, $id_espece) {
 
$params = array(
'module' => 'Individu',
188,10 → 165,10
'id_station' => $id_station,
'id_espece' => $id_espece
);
return self::instance()->construireUrl($params);
return self::construireUrl($params);
}
public function getUrlConsultationEspeceStation($id_station, $id_espece, $annee = null) {
public static function getUrlConsultationEspeceStation($id_station, $id_espece, $annee = null) {
if($annee == null) {
$annee = date('Y');
205,10 → 182,10
'annee' => $annee
);
return self::instance()->construireUrl($params);
return self::construireUrl($params);
}
public function getUrlFormulaireModificationObservation($id_station,$id_espece, $id_individu, $annee = null) {
public static function getUrlFormulaireModificationObservation($id_station,$id_espece, $id_individu, $annee = null) {
if($annee == null) {
$annee = date('Y');
223,10 → 200,10
'annee' => $annee
);
return self::instance()->construireUrl($params);
return self::construireUrl($params);
}
public function getUrlValidationFormulaireModificationObservation($id_station,$id_espece, $id_individu, $annee = null) {
public static function getUrlValidationFormulaireModificationObservation($id_station,$id_espece, $id_individu, $annee = null) {
if($annee == null) {
$annee = date('Y');
241,29 → 218,29
'annee' => $annee
);
return self::instance()->construireUrl($params);
return self::construireUrl($params);
}
public function renvoyerStylesInclus() {
public static function renvoyerStylesInclus() {
$styles = '';
$styles .= '<link href="'.Liens::instance()->getUrlStyle().'saisie.css" rel="stylesheet" type="text/css"/>';
$styles .= '<link href="'.Liens::instance()->getUrlStyle().'jquery_ui/jquery-ui-1.8.6.custom.css" rel="stylesheet" type="text/css"/>';
$styles .= '<link href="'.Liens::instance()->getUrlStyle().'jquery_ui/jquery.ui.datepicker.css" rel="stylesheet" type="text/css"/>';
$styles .= '<link href="'.self::getUrlStyle().'saisie.css" rel="stylesheet" type="text/css"/>';
$styles .= '<link href="'.self::getUrlStyle().'jquery_ui/jquery-ui-1.8.6.custom.css" rel="stylesheet" type="text/css"/>';
$styles .= '<link href="'.self::getUrlStyle().'jquery_ui/jquery.ui.datepicker.css" rel="stylesheet" type="text/css"/>';
return $styles;
}
public function renvoyerScriptsInclus() {
public static function renvoyerScriptsInclus() {
$scripts = '';
$scripts .= '<script type="text/javascript" src="http://maps.google.com/maps/api/js?sensor=false"></script>';
$scripts .= '<script type="text/javascript" src="'.Liens::instance()->getUrlScript().'jquery-1.4.4.min.js"></script>';
$scripts .= '<script type="text/javascript" src="'.Liens::instance()->getUrlScript().'jquery_ui/jquery-ui-1.8.6.custom.min.js"></script>';
$scripts .= '<script type="text/javascript" src="'.Liens::instance()->getUrlScript().'saisie.min.js"></script>';
$scripts .= '<script type="text/javascript" src="'.Liens::instance()->getUrlScript().'jquery_ui/jquery.ui.datepicker.js"></script>';
$scripts .= '<script type="text/javascript" src="'.Liens::instance()->getUrlScript().'jquery_ui/jquery.ui.datepicker-fr.js"></script>';
$scripts .= '<script type="text/javascript" src="'.self::getUrlScript().'jquery-1.4.4.min.js"></script>';
$scripts .= '<script type="text/javascript" src="'.self::getUrlScript().'jquery_ui/jquery-ui-1.8.6.custom.min.js"></script>';
$scripts .= '<script type="text/javascript" src="'.self::getUrlScript().'saisie.min.js"></script>';
$scripts .= '<script type="text/javascript" src="'.self::getUrlScript().'jquery_ui/jquery.ui.datepicker.js"></script>';
$scripts .= '<script type="text/javascript" src="'.self::getUrlScript().'jquery_ui/jquery.ui.datepicker-fr.js"></script>';
return $scripts;
270,4 → 247,5
}
}
}
?>
/trunk/applications/saisie/controleurs/Individu.php
23,7 → 23,9
public function initialiser() {
$this->id_individu_en_cours = $_GET['id_individu'];
if(isset($_GET['id_individu'])) {
$this->id_individu_en_cours = $_GET['id_individu'];
}
$this->setNavigation();
}
81,7 → 83,7
$observation = new Observation();
$individu['observations'] = $observation->getListeObservationsPourIndividu($individu['id_individu']);
$individu['url'] = Liens::instance()->getUrlConsultationFicheIndividu($individu['id_individu'],$individu['id_individu']);
$individu['url'] = Liens::getUrlConsultationFicheIndividu($id_station, $id_espece, $individu['id_individu']);
}
 
$donnees['evenements'] = $evenements;
174,4 → 176,5
return $liste_observation_pour_individu;
}
}
}
?>
/trunk/applications/saisie/controleurs/Observation.php
23,7 → 23,9
public function initialiser() {
$this->id_observation_en_cours = $_GET['id_observation'];
if(isset($_GET['$id_observation'])) {
$this->id_observation_en_cours = $_GET['id_observation'];
}
$this->setNavigation();
}
57,7 → 59,7
$observation = new Observation();
$individu['observations'] = $observation->getListeObservationsPourIndividu($individu['id_individu']);
$individu['url'] = Liens::instance()->getUrlConsultationFicheIndividu($id_station,$id_espece, $individu['id_individu']);
$individu['url'] = Liens::getUrlConsultationFicheIndividu($id_station,$id_espece, $individu['id_individu']);
}
197,4 → 199,5
return '';
}
}
}
?>