Subversion Repositories eFlore/Applications.del

Compare Revisions

Ignore whitespace Rev 759 → Rev 758

/trunk/services/modules/0.1/images/VoteImage.php
File deleted
\ No newline at end of file
/trunk/services/modules/0.1/images/ListeImages.php
23,13 → 23,10
private $masque;
private $gestionBdd;
private $bdd;
private $parametres = array();
private $ressources = array();
public function __construct(Conteneur $conteneur = null) {
$this->conteneur = $conteneur == null ? new Conteneur() : $conteneur;
$this->conteneur->chargerConfiguration('config_departements.ini');
$this->conteneur->chargerConfiguration('config_votes.ini');
$this->navigation = $conteneur->getNavigation();
$this->masque = $conteneur->getMasque();
$this->gestionBdd = $conteneur->getGestionBdd();
44,7 → 41,6
* @param array $parametres les paramètres situés après le ? dans l'url
* */
public function consulter($ressources, $parametres) {
$this->initialiserRessourcesEtParametres($ressources, $parametres);
// Gestion des configuration du script
$this->configurer();
63,10 → 59,6
return $resultat;
}
private function initialiserRessourcesEtParametres($ressources, $parametres) {
$this->ressources = $ressources;
$this->parametres = $parametres;
}
/*-------------------------------------------------------------------------------
CONFIGURATION DU SERVICE
--------------------------------------------------------------------------------*/
76,7 → 68,6
public function configurer() {
$this->mappingFiltre = $this->conteneur->getParametre('mapping_masque');
$this->mappingObservation = $this->conteneur->getParametre('mapping_observation');
$this->mappingVotes = $this->conteneur->getParametre('mapping_votes');
}
/**
262,11 → 253,12
* */
private function chargerVotes($images) {
if (sizeof($this->imageIds) > 0) {
$chaineImageIds = implode(',', $this->imageIds);
$requeteVotes = 'SELECT * FROM '.
$this->gestionBdd->formaterTable('del_image_vote').
'WHERE '.$this->chargerClauseWhereVotes();
'WHERE ce_image IN ('.$chaineImageIds.')';
$resultatsVotes = $this->bdd->recupererTous($requeteVotes);
278,21 → 270,11
$images[$id]['votes'] = $votes[$image['id_image']];
}
}
}
return $images;
}
private function chargerClauseWhereVotes() {
if (sizeof($this->imageIds) > 0) {
$chaineImageIds = implode(',', $this->imageIds);
$where[] = 'ce_image IN ('.$chaineImageIds.')';
}
if (isset($this->parametres['protocole'])) {
$where[] = 'ce_protocole = '.$this->proteger($this->parametres['protocole']);
}
return implode(' AND ', $where);
}
/*-------------------------------------------------------------------------------
FORMATER ET METTRE EN FORME
--------------------------------------------------------------------------------*/
320,11 → 302,17
private function formaterVotes($votes) {
$retour = array();
foreach ($votes as $vote) {
$retour_vote = array();
foreach ($vote as $param=>$valeur) {
$retour_vote[$this->mappingVotes[$param]] = $valeur;
}
$retour[$vote['ce_image']][$vote['ce_protocole']][$vote['id_vote']] = $retour_vote;
$idImage = $vote['ce_image'];
$id = $vote['id_vote_image'];
$id_protocole = $vote['ce_protocole'];
$auteur_id = $vote['ce_utilisateur'];
$valeur = $vote['valeur_vote'];
$date = $vote['date_vote_image'];
$retour[$idImage]['valeur'] = $valeur;
$retour[$idImage]['protocole'] = $id_protocole;
$retour[$idImage]['auteur_id'] = $auteur_id;
$retour[$idImage]['date'] = $auteur_id;
}
return $retour;
/trunk/services/modules/0.1/images/VotesImage.php
87,12 → 87,12
}
 
if (empty($this->mappingVotes)) {
$erreurs[] = '- le fichier de configuration ne contient pas le tableau [mapping_votes] ou celui-ci est vide ;';
$erreurs[] = '- le fichier de configuration ne contient pas le tableau [mapping_observation] ou celui-ci est vide ;';
} else {
$champsMappingObs = array('ce_protocole','id_vote','valeur','ce_image', 'ce_utilisateur', 'nom', 'prenom');
foreach ($champsMappingObs as $champ) {
if (!isset($this->mappingVotes[$champ])) {
$erreurs[] = '- le mapping du champ "'.$champ.'" pour le vote est manquant ;';
$erreurs[] = '- le mapping du champ "'.$champ.'" pour l\'observation est manquant ;';
}
}
}
/trunk/services/configurations/config_votes.ini
25,3 → 25,6
prenom = auteur.prenom
courriel = auteur.courriel
date = date
 
[mapping_masque]
id_proposition = ce_proposition