Skip to content
Snippets Groups Projects
Commit b1918404 authored by Laurent Lecluse's avatar Laurent Lecluse
Browse files

Tâche #25954 

Export CSV des services : en faire un état de sortie paramétrable
parent 7e25bf95
Branches
Tags
No related merge requests found
Show whitespace changes
Inline Side-by-side
data/Etats de sortie/export_services_csv.php
+ 254
− 0
View file @ b1918404
<?php
/**
* @var $csv \UnicaenApp\View\Model\CsvModel
* @var $etatSortie \Application\Entity\Db\EtatSortie
* @var $data array
* @var $filtres array
* @var $entityManager \Doctrine\ORM\EntityManager
* @var $role \Application\Acl\Role
* @var $options array
*
* @return array
*/
// initialisation
$res = [];
$shown = [];
$typesIntervention = [];
$invertTi = [];
$numericColunms = [
'service-statutaire',
'service-du-modifie',
'heures-non-payees',
'heures-ref',
'service-fi',
'service-fa',
'service-fc',
'service-referentiel',
'heures-compl-fi',
'heures-compl-fa',
'heures-compl-fc',
'heures-compl-fc-majorees',
'heures-compl-referentiel',
'total',
'solde',
];
$dateColumns = [
'service-date-modification',
'intervenant-date-naissance',
'date-cloture-service-realise',
];
$addableColumns = [
'__total__',
'heures-non-payees',
'heures-ref',
'service-fi',
'service-fa',
'service-fc',
'service-referentiel',
'heures-compl-fi',
'heures-compl-fa',
'heures-compl-fc',
'heures-compl-fc-majorees',
'heures-compl-referentiel',
'total',
];
// récupération des données
foreach ($data as $d) {
if ((int)$d['HEURES_NON_PAYEES'] === 1) {
$d['HEURES_NON_PAYEES'] = $d['HEURES'];
$d['HEURES'] = 0;
}
$sid = $d['SERVICE_ID'] ? $d['SERVICE_ID'] . '_' . $d['PERIODE_ID'] : $d['ID'];
$ds = [
'__total__' => (float)$d['HEURES'] + (float)$d['HEURES_NON_PAYEES'] + (float)$d['HEURES_REF'] + (float)$d['TOTAL'],
'type-etat' => $d['TYPE_ETAT'],
'date' => new \DateTime(),
'service-date-modification' => $d['SERVICE_DATE_MODIFICATION'],
'annee-libelle' => (string)$options['annee'],
'intervenant-code' => $d['INTERVENANT_CODE'],
'intervenant-nom' => $d['INTERVENANT_NOM'],
'intervenant-date-naissance' => $d['INTERVENANT_DATE_NAISSANCE'],
'intervenant-statut-libelle' => $d['INTERVENANT_STATUT_LIBELLE'],
'intervenant-type-libelle' => $d['INTERVENANT_TYPE_LIBELLE'],
'intervenant-grade-code' => $d['INTERVENANT_GRADE_CODE'],
'intervenant-grade-libelle' => $d['INTERVENANT_GRADE_LIBELLE'],
'intervenant-discipline-code' => $d['INTERVENANT_DISCIPLINE_CODE'],
'intervenant-discipline-libelle' => $d['INTERVENANT_DISCIPLINE_LIBELLE'],
'heures-service-statutaire' => (float)$d['SERVICE_STATUTAIRE'],
'heures-service-du-modifie' => (float)$d['SERVICE_DU_MODIFIE'],
'service-structure-aff-libelle' => $d['SERVICE_STRUCTURE_AFF_LIBELLE'],
'service-structure-ens-libelle' => $d['SERVICE_STRUCTURE_ENS_LIBELLE'],
'groupe-type-formation-libelle' => $d['GROUPE_TYPE_FORMATION_LIBELLE'],
'type-formation-libelle' => $d['TYPE_FORMATION_LIBELLE'],
'etape-niveau' => empty($d['ETAPE_NIVEAU']) ? null : (int)$d['ETAPE_NIVEAU'],
'etape-code' => $d['ETAPE_CODE'],
'etape-etablissement-libelle' => $d['ETAPE_LIBELLE'] ? $d['ETAPE_LIBELLE'] : ($d['SERVICE_REF_FORMATION'] ? $d['SERVICE_REF_FORMATION'] : $d['ETABLISSEMENT_LIBELLE']),
'element-code' => $d['ELEMENT_CODE'],
'element-fonction-libelle' => $d['ELEMENT_LIBELLE'] ? $d['ELEMENT_LIBELLE'] : $d['FONCTION_REFERENTIEL_LIBELLE'],
'element-discipline-code' => $d['ELEMENT_DISCIPLINE_CODE'],
'element-discipline-libelle' => $d['ELEMENT_DISCIPLINE_LIBELLE'],
'element-taux-fi' => (float)$d['ELEMENT_TAUX_FI'],
'element-taux-fc' => (float)$d['ELEMENT_TAUX_FC'],
'element-taux-fa' => (float)$d['ELEMENT_TAUX_FA'],
'commentaires' => $d['COMMENTAIRES'],
'element-ponderation-compl' => $d['ELEMENT_PONDERATION_COMPL'] === null ? null : (float)$d['ELEMENT_PONDERATION_COMPL'],
'element-source-libelle' => $d['ELEMENT_SOURCE_LIBELLE'],
'periode-libelle' => $d['PERIODE_LIBELLE'],
'heures-non-payees' => (float)$d['HEURES_NON_PAYEES'],
// types d'intervention traités en aval
'heures-ref' => (float)$d['HEURES_REF'],
'service-fi' => (float)$d['SERVICE_FI'],
'service-fa' => (float)$d['SERVICE_FA'],
'service-fc' => (float)$d['SERVICE_FC'],
'service-referentiel' => (float)$d['SERVICE_REFERENTIEL'],
'heures-compl-fi' => (float)$d['HEURES_COMPL_FI'],
'heures-compl-fa' => (float)$d['HEURES_COMPL_FA'],
'heures-compl-fc' => (float)$d['HEURES_COMPL_FC'],
'heures-compl-fc-majorees' => (float)$d['HEURES_COMPL_FC_MAJOREES'],
'heures-compl-referentiel' => (float)$d['HEURES_COMPL_REFERENTIEL'],
'total' => (float)$d['HEURES_COMPL_FI'] + (float)$d['HEURES_COMPL_FA'] + (float)$d['HEURES_COMPL_FC'] + (float)$d['HEURES_COMPL_FC_MAJOREES'] + (float)$d['HEURES_COMPL_REFERENTIEL'],
'solde' => (float)$d['SOLDE'],
'date-cloture-service-realise' => $d['DATE_CLOTURE_REALISE'],
];
if (
$ds['heures-service-statutaire'] > 0
&& $ds['heures-service-statutaire'] + $ds['heures-service-du-modifie'] == 0
&& empty($ds['etape-code'])
) {
$ds['__total__']++; // pour que le cas spécifique des décharges totales soit pris en compte
}
if ($d['TYPE_INTERVENTION_ID'] != null) {
$tid = $d['TYPE_INTERVENTION_ID'];
if (!isset($typesIntervention[$tid])) {
$typesIntervention[$tid] = $entityManager->getRepository(\Application\Entity\Db\TypeIntervention::class)->find($tid);
}
$typeIntervention = $typesIntervention[$tid];
$invertTi['type-intervention-' . $typeIntervention->getCode()] = $typeIntervention->getId();
$ds['type-intervention-' . $typeIntervention->getCode()] = (float)$d['HEURES'];
}
foreach ($ds as $column => $value) {
if (!isset($shown[$column])) $shown[$column] = 0;
if (is_float($value)) {
$shown[$column] += $value;
} else {
$shown[$column] += empty($value) ? 0 : 1;
}
}
if (!isset($res[$sid])) {
$res[$sid] = $ds;
} else {
foreach ($ds as $column => $value) {
if (in_array($column, $addableColumns) || 0 === strpos($column, 'type-intervention-')) {
if (!isset($res[$sid][$column])) {
$res[$sid][$column] = $value;
} // pour les types d'intervention non initialisés
else $res[$sid][$column] += $value;
} elseif ($value != $res[$sid][$column]) {
$res[$sid][$column] = null;
}
}
}
}
// tri et préparation des entêtes
$head = [
'type-etat' => 'Type État',
'date' => 'Date d\'extraction',
'annee-libelle' => 'Année universitaire',
'service-date-modification' => 'Date de modif. du service',
'intervenant-code' => 'Code intervenant',
'intervenant-nom' => 'Intervenant',
'intervenant-date-naissance' => 'Date de naissance',
'intervenant-statut-libelle' => 'Statut intervenant',
'intervenant-type-libelle' => 'Type d\'intervenant',
'intervenant-grade-code' => 'Grade (Code)',
'intervenant-grade-libelle' => 'Grade',
'intervenant-discipline-code' => 'Discipline intervenant (Code)',
'intervenant-discipline-libelle' => 'Discipline intervenant',
'heures-service-statutaire' => 'Service statutaire',
'heures-service-du-modifie' => 'Modification de service du',
'service-structure-aff-libelle' => 'Structure d\'affectation',
'service-structure-ens-libelle' => 'Structure d\'enseignement',
'groupe-type-formation-libelle' => 'Groupe de type de formation',
'type-formation-libelle' => 'Type de formation',
'etape-niveau' => 'Niveau',
'etape-code' => 'Code formation',
'etape-etablissement-libelle' => 'Formation ou établissement',
'element-code' => 'Code enseignement',
'element-fonction-libelle' => 'Enseignement ou fonction référentielle',
'element-discipline-code' => 'Discipline ens. (Code)',
'element-discipline-libelle' => 'Discipline ens.',
'element-taux-fi' => 'Taux FI',
'element-taux-fc' => 'Taux FC',
'element-taux-fa' => 'Taux FA',
'commentaires' => 'Commentaires',
'element-ponderation-compl' => 'Majoration',
'element-source-libelle' => 'Source enseignement',
'periode-libelle' => 'Période',
'heures-non-payees' => 'Heures non payées',
];
uasort($typesIntervention, function ($ti1, $ti2) {
return $ti1->getOrdre() > $ti2->getOrdre();
});
foreach ($typesIntervention as $typeIntervention) {
/* @var $typeIntervention \Application\Entity\Db\TypeIntervention */
$head['type-intervention-' . $typeIntervention->getCode()] = $typeIntervention->getCode();
}
$head['heures-ref'] = 'Référentiel';
$head['service-fi'] = 'HETD Service FI';
$head['service-fa'] = 'HETD Service FA';
$head['service-fc'] = 'HETD Service FC';
$head['service-referentiel'] = 'HETD Service Référentiel';
$head['heures-compl-fi'] = 'HETD Compl. FI';
$head['heures-compl-fa'] = 'HETD Compl. FA';
$head['heures-compl-fc'] = 'HETD Compl. FC';
$head['heures-compl-fc-majorees'] = 'HETD Compl. FC D714-60';
$head['heures-compl-referentiel'] = 'HETD Compl. référentiel';
$head['total'] = 'Total HETD';
$head['solde'] = 'Solde HETD';
$head['date-cloture-service-realise'] = 'Clôture du service réalisé';
// suppression des informations superflues
foreach ($shown as $column => $visibility) {
if (isset($head[$column]) && empty($visibility)) {
unset($head[$column]);
if (isset($invertTi[$column])) {
unset($typesIntervention[$invertTi[$column]]);
}
}
}
$columns = array_keys($head);
foreach ($res as $sid => $d) {
if (0 == $d['__total__']) {
unset($res[$sid]); // pas d'affichage pour quelqu'un qui n'a rien
} else {
$res[$sid] = [];
foreach ($columns as $column) {
$value = isset($d[$column]) ? $d[$column] : null;
if (null === $value && (in_array($column, $numericColunms) || 0 === strpos($column, 'type-intervention-'))) {
$value = 0;
}
if (in_array($column, $dateColumns)) {
if (empty($value)) $value = null; else $value = \DateTime::createFromFormat('Y-m-d', substr($value, 0, 10));
}
$res[$sid][$column] = $value;
}
}
}
$csv->setHeader($head);
$csv->addLines($res);
\ No newline at end of file
module/Application/config/service.config.php
+ 9
− 9
View file @ b1918404
......@@ -29,12 +29,12 @@ return [
],
],
],
'export' => [
'export-csv' => [
'type' => 'Literal',
'options' => [
'route' => '/export',
'route' => '/export-csv',
'defaults' => [
'action' => 'export',
'action' => 'export-csv',
],
],
],
......@@ -311,7 +311,7 @@ return [
],
[
'controller' => 'Application\Controller\Service',
'action' => ['export'],
'action' => ['export-csv'],
'privileges' => [
Privileges::ENSEIGNEMENT_EXPORT_CSV,
],
......
module/Application/src/Application/Controller/ServiceController.php
+ 25
− 27
View file @ b1918404
......@@ -123,17 +123,12 @@ class ServiceController extends AbstractController
public function exportAction()
public function exportCsvAction()
{
$role = $this->getServiceContext()->getSelectedIdentityRole();
$intervenant = $role->getIntervenant() ?: $this->getEvent()->getParam('intervernant');
$intervenant = $this->getEvent()->getParam('intervenant');
/* @var $intervenant Intervenant */
$this->initFilters();
if ($intervenant) {
$this->getServiceLocalContext()->setIntervenant($intervenant);
}
$annee = $this->getServiceContext()->getAnnee();
$structure = $this->getServiceContext()->getStructure();
if (!$intervenant) {
$rr = $this->rechercheAction();
......@@ -145,34 +140,38 @@ class ServiceController extends AbstractController
}
/* Préparation et affichage */
$params = [
'ignored-columns' => ['intervenant-type-code'],
];
if ($structure = $this->getServiceContext()->getSelectedIdentityRole()->getStructure()) {
$params['composante'] = $structure;
$etatSortie = $this->getServiceEtatSortie()->getByParametre('es_services_csv');
$fileName = 'Listing des services - ' . date('dmY') . '.csv';
$filters = $recherche->getFilters();
$filters['ANNEE_ID'] = $annee->getId();
if ($structure) {
$filters['STRUCTURE_AFF_ID OR STRUCTURE_ENS_ID'] = $structure->getId();
}
$data = $this->getServiceService()->getTableauBord($recherche, $params);
$csvModel = new CsvModel();
$csvModel->setHeader($data['head']);
$csvModel->addLines($data['data']);
$csvModel->setFilename('service.csv');
$options = [
'annee' => $annee->getLibelle(),
'type_volume_horaire' => $recherche->getTypeVolumeHoraire()->getLibelle(),
'etat_volume_horaire' => $recherche->getEtatVolumeHoraire()->getLibelle(),
'composante' => $recherche->getStructureAff() ? $recherche->getStructureAff()->getLibelleCourt() : 'Toutes',
'type_intervenant' => $recherche->getTypeIntervenant() ? $recherche->getTypeIntervenant()->getLibelle() : 'Tous intervenants',
];
$csv = $this->getServiceEtatSortie()->genererCsv($etatSortie, $filters, $options);
$csv->setFilename($fileName);
return $csvModel;
return $csv;
}
public function exportPdfAction()
{
$role = $this->getServiceContext()->getSelectedIdentityRole();
$intervenant = $this->getEvent()->getParam('intervenant');
/* @var $intervenant Intervenant */
$intervenant = $role->getIntervenant() ?: $this->getEvent()->getParam('intervernant');
$annee = $this->getServiceContext()->getAnnee();
$structure = $this->getServiceContext()->getStructure();
$this->initFilters();
if (!$intervenant) {
$rr = $this->rechercheAction();
$recherche = $rr['rechercheForm']->getObject();
......@@ -198,7 +197,6 @@ class ServiceController extends AbstractController
'composante' => $recherche->getStructureAff() ? $recherche->getStructureAff()->getLibelleCourt() : 'Toutes',
'type_intervenant' => $recherche->getTypeIntervenant() ? $recherche->getTypeIntervenant()->getLibelle() : 'Tous intervenants',
];
if ($c10 = $this->getServiceContext()->getStructure()) $conditions['structure_context_id'] = '(structure_ens_id = ' . $c10->getId() . ' OR structure_aff_id = ' . $c10->getId() . ')';
$document = $this->getServiceEtatSortie()->genererPdf($etatSortie, $filters, $options);
......
module/Application/src/Application/Form/Service/RechercheForm.php
+ 1
− 1
View file @ b1918404
......@@ -211,7 +211,7 @@ class RechercheForm extends AbstractForm implements EntityManagerAwareInterface,
$this->addActionButton('submit-resume', 'Afficher (résumé)', $this->getUrl('service/resume'), true);
$this->addActionButton('submit-details', 'Afficher (détails)', $this->getUrl('service'));
if ($this->getServiceAuthorize()->isAllowed(Privileges::getResourceId(Privileges::ENSEIGNEMENT_EXPORT_CSV))) {
$this->addActionButton('submit-export-csv', 'Exporter (CSV)', $this->getUrl('service/export'));
$this->addActionButton('submit-export-csv', 'Exporter (CSV)', $this->getUrl('service/export-csv'));
}
if ($this->getServiceAuthorize()->isAllowed(Privileges::getResourceId(Privileges::ENSEIGNEMENT_EXPORT_PDF))) {
$this->addActionButton('submit-export-pdf', 'Exporter (PDF)', $this->getUrl('service/export-pdf'));
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment