/trunk/jrest/services/GroupesChampsEtendus.php |
---|
File deleted |
\ No newline at end of file |
/trunk/jrest/services/CelSyndicationObservation.php |
---|
40,6 → 40,7 |
'date' => 'date_observation', |
'motcle' => 'tags', |
'projet' => 'mots-cles'); |
private $catalogue_cles_labels_champs_etendus = array(); |
/** |
* Méthode appelée avec une requête de type GET. |
422,6 → 423,9 |
} |
$gestion_champs_etendus = new GestionChampsEtendus($this->config, 'obs'); |
$champs_etendus = $gestion_champs_etendus->consulterParLots($ids_observations); |
if(!empty($champs_etendus)) { |
$this->catalogue_cles_labels_champs_etendus = $gestion_champs_etendus->consulterCatalogueChampsEtendusPredefinis(true); |
} |
$this->auteurs = $this->creerAuteurs($identifiants); |
foreach ($elements as $element) { |
$element['obs_etendue'] = isset($champs_etendus[$element['id_observation']]) ? $champs_etendus[$element['id_observation']] : array(); |
541,7 → 545,14 |
private function creerDescriptionChampsEtendus($obs, $item) { |
$champs_etendus = ''; |
foreach($obs['obs_etendue'] as $cle => &$champ) { |
$champs_etendus .= '<li>'.$this->nePasInterpreterXml($champ->label.' : '.$champ->valeur).' </li>'; |
if(isset($this->catalogue_cles_labels_champs_etendus[$champ->cle])) { |
$label = $this->catalogue_cles_labels_champs_etendus[$champ->cle]['label']; |
} else { |
$label = preg_replace("/(?<=\\w)(?=[A-Z])/"," $1", $champ->cle); |
$label = trim($label); |
$label = $label; |
} |
$champs_etendus .= '<li>'.$this->nePasInterpreterXml($label.' : '.$champ->valeur).' </li>'; |
} |
if($champs_etendus != '') { |
/trunk/jrest/services/CelWidgetSaisie.php |
---|
265,18 → 265,12 |
if ($champs != null && is_array($champs)) { |
foreach ($champs as $infosChamp) { |
$cle = isset($infosChamp['cle']) ? $infosChamp['cle'] : ''; |
$label = isset($infosChamp['label']) ? $infosChamp['label'] : ''; |
$valeur = isset($infosChamp['valeur']) ? $infosChamp['valeur'] : ''; |
if (empty($cle) && !empty($label)) { |
$cle = $gestionChampsEtendus->transformerLabelEnCle($label); |
} |
if (!empty($cle) && !empty($valeur)) { |
$champEtendu = new ChampEtendu(); |
$champEtendu->id = $id_obs; |
$champEtendu->cle = $cle; |
$champEtendu->label = empty($label) ? $cle : $label; |
$champEtendu->valeur = $valeur; |
$champs_etendus_obs[] = $champEtendu; |
/trunk/jrest/services/CatalogueChampsEtendus.php |
---|
New file |
0,0 → 1,34 |
<?php |
// in utf8 |
// out utf8 |
// Fournit la liste des groupes de champs etendus |
class CatalogueChampsEtendus extends Cel { |
function getElement($uid){ |
$referentiel = array(); |
// TODO : meilleure vérification si ce service vient à être utilisé par autre chose |
// que le cel |
if($uid[0] == "groupes") { |
$gestion_champs_etendus = new GestionChampsEtendus($this->config, 'obs'); |
$referentiel = $gestion_champs_etendus->consulterGroupesChampsEtendusPredefinis(); |
} else if($uid[0] == "champs") { |
$gestion_champs_etendus = new GestionChampsEtendus($this->config, 'obs'); |
$referentiel = $gestion_champs_etendus->consulterCatalogueChampsEtendusPredefinis(); |
} |
$this->envoyerJson($referentiel); |
return true; |
} |
function getRessource() { |
$groupes = $gestion_champs_etendus->consulterGroupesChampsEtendusPredefinis(); |
$this->envoyerJson($groupes); |
return true; |
} |
} |
/trunk/jrest/services/Inventory.php |
---|
109,8 → 109,7 |
if($this->doitGenererCleChampEtendu($champ_etendu)) { |
$champ_etendu['cle'] = $gestion_champs_etendus->transformerLabelEnCle($champ_etendu['label']); |
} |
$objet_champ_etendu->cle = $champ_etendu['cle']; |
$objet_champ_etendu->label = $champ_etendu['label']; |
$objet_champ_etendu->cle = $champ_etendu['cle']; |
$objet_champ_etendu->valeur = $champ_etendu['valeur']; |
$champ_etendu = $objet_champ_etendu; |
} |
146,8 → 145,7 |
if($this->doitGenererCleChampEtendu($champ_etendu)) { |
$champ_etendu['cle'] = $gestion_champs_etendus->transformerLabelEnCle($champ_etendu['label']); |
} |
$objet_champ_etendu->cle = $champ_etendu['cle']; |
$objet_champ_etendu->label = $champ_etendu['label']; |
$objet_champ_etendu->cle = $champ_etendu['cle']; |
$objet_champ_etendu->valeur = $champ_etendu['valeur']; |
$champ_etendu = $objet_champ_etendu; |
} |
/trunk/jrest/services/NomsChampsEtendus.php |
---|
33,12 → 33,22 |
return true; |
} |
function rechercherCles($recherche_cle) { |
$requete = "SELECT DISTINCT cle, label FROM cel_obs_etendues WHERE ". |
"cle LIKE ".Cel::db()->proteger($recherche_cle)." OR ". |
"label LIKE ".Cel::db()->proteger($recherche_cle)." "; |
function rechercherCles($recherche_cle) { |
// Recherche dans clé du catalogue et les clés déja saisies par les utilisateurs. |
// Si une clé est présente dans les deux tables, on privilégie celle du catalogue |
// qui contient un label bien formé |
$requete = "(SELECT cle, label, 'catalogue' FROM cel_catalogue_champs_etendus WHERE ". |
"label LIKE ".Cel::db()->proteger($recherche_cle)." ". |
"AND groupe = 0 ". |
") ". |
"UNION ". |
"(SELECT DISTINCT cle, cle as label, 'utilisateur' FROM cel_obs_etendues WHERE ". |
"cle LIKE ".Cel::db()->proteger($recherche_cle). |
"AND cle NOT IN (SELECT cle FROM cel_catalogue_champs_etendus) ". |
") "; |
$resultat = Cel::db()->requeter($requete); |
$referentiel = array(); |
foreach($resultat as $valeur) { |
$referentiel[$valeur['cle']] = $valeur['label']; |
/trunk/jrest/services/ImportXLS.php |
---|
1058,13 → 1058,12 |
foreach($champ_etendu_a_obs['champs_etendus'] as $label => $champ) { |
// XXX: insère t'on des valeurs vides ? |
$valeur = $champ; |
$cle = self::$gestion_champs_etendus->transformerLabelEnCle($label); |
$cle = $label; |
if (!empty($cle) && !empty($valeur)) { |
$champ_etendu_a_inserer = new ChampEtendu(); |
$champ_etendu_a_inserer->id = $id_obs; |
$champ_etendu_a_inserer->cle = $cle; |
$champ_etendu_a_inserer->label = empty($label) ? $cle : $label; |
$champ_etendu_a_inserer->valeur = $valeur; |
$champs_etendus_obs[] = $champ_etendu_a_inserer; |
/trunk/jrest/services/CelObs.php |
---|
101,7 → 101,7 |
private function preparerChampsEtendus($champs) { |
$retour = array(); |
foreach ($champs as $chp) { |
$retour[$chp['cle']] = array('valeur' => $chp['valeur'], 'label' => $chp['label']); |
$retour[$chp['cle']] = array('valeur' => $chp['valeur']); |
} |
return $retour; |
} |