| /trunk/jrest/services/CoelExport.php |
|---|
| 181,8 → 181,9 |
| $stockage_params_nbre = empty($stockage_params_nbre) ? 0 : $stockage_params_nbre; |
| $collection_nbre = $collections_par_structure[$structure['cs_id_structure']]; |
| $collection_nbre = empty($collection_nbre) ? 0 : $collection_nbre; |
| $personnel_heure_nbre = empty($structure['personnel_heure_nbre']) ? 0 : $structure['personnel_heure_nbre']; |
| $visite_avec_motif_science = $structure['csv_mark_visite_avec_motif']; |
| // désactivé à la demande de Louise - 01/09/2014 |
| //$personnel_heure_nbre = empty($structure['personnel_heure_nbre']) ? 0 : $structure['personnel_heure_nbre']; |
| //$visite_avec_motif_science = $structure['csv_mark_visite_avec_motif']; |
| $structure_affichage = array( |
| 'nom' => $nom, |
| 197,8 → 198,9 |
| 'stockage_params' => $stockage_params, |
| 'stockage_params_nbre' => $stockage_params_nbre, |
| 'collection_nbre' => $collection_nbre, |
| 'personnel_heure_nbre' => $personnel_heure_nbre, |
| 'visite_avec_motif_science' => $visite_avec_motif_science); |
| //'personnel_heure_nbre' => $personnel_heure_nbre, |
| //'visite_avec_motif_science' => $visite_avec_motif_science |
| ); |
| $structure_affichage = $this->nettoyerTableau($structure_affichage); |
| $donnees['structures'][$id_structure] = $structure_affichage; |
| /trunk/jrest/services/squelettes/export_structure_expertise.tpl.csv |
|---|
| 1,4 → 1,4 |
| "id","nom","description","adresse","code_postal","ville","telephone","courriel","url","type","stockage_parametres","stockage_parametres_nbre","collection_nbre","personnel_nbre_heure_cumulees","visite_avec_motif_science" |
| "id","nom","description","adresse","code_postal","ville","telephone","courriel","url","type","stockage_parametres","stockage_parametres_nbre","collection_nbre" |
| <?php foreach ($structures as $id => $structure) : ?> |
| "<?=$id?>","<?=$structure['nom']?>","<?=$structure['description']?>","<?=$structure['adresse']?>","<?=$structure['code_postal']?>","<?=$structure['ville']?>","<?=$structure['telephone']?>","<?=$structure['courriel']?>","<?=$structure['url']?>","<?=$structure['type']?>","<?=$structure['stockage_params']?>","<?=$structure['stockage_params_nbre']?>","<?=$structure['collection_nbre']?>","<?=$structure['personnel_heure_nbre']?>","<?=$structure['visite_avec_motif_science']?>" |
| "<?=$id?>","<?=$structure['nom']?>","<?=$structure['description']?>","<?=$structure['adresse']?>","<?=$structure['code_postal']?>","<?=$structure['ville']?>","<?=$structure['telephone']?>","<?=$structure['courriel']?>","<?=$structure['url']?>","<?=$structure['type']?>","<?=$structure['stockage_params']?>","<?=$structure['stockage_params_nbre']?>","<?=$structure['collection_nbre']?>" |
| <?php endforeach; ?> |
| /trunk/. |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /branches/v1.6-muscardin:r1838 |