Meilleur affichage des fiches historisées (172d5fec) · Commits · JACQUOT Frederic / OSE

data/privileges.php

+1 −0

Changes for data/privileges.php: 1 added line, 0 removed lines.
Original line number	Diff line number	Diff line
		@@ -44,6 +44,7 @@ return [
		'calcul-hetd' => 'Calcul HETD',
		'creation' => 'Création',
		'ajout-statut' => 'Ajout d\'un nouveau statut',
		'visualisation-historises' => 'Voir les intervenants historisés',
		'edition' => 'Edition',
		'suppression' => 'Suppression',
		'statut-edition' => 'Statuts (Édition)',

module/Application/src/Application/Controller/IntervenantController.php

+2 −2

Changes for module/Application/src/Application/Controller/IntervenantController.php: 2 added lines, 2 removed lines.
Original line number	Diff line number	Diff line
		@@ -108,8 +108,8 @@ class IntervenantController extends AbstractController
		$critere = $this->params()->fromPost('critere');
		$recherche = $this->getProcessusIntervenant()->recherche();

		$canRestaure = $this->isAllowed(Privileges::getResourceId(Privileges::INTERVENANT_AJOUT_STATUT));
		$recherche->setShowHisto($canRestaure);
		$canShowHistorises = $this->isAllowed(Privileges::getResourceId(Privileges::INTERVENANT_VISUALISATION_HISTORISES));
		$recherche->setShowHisto($canShowHistorises);

		$intervenants = $recherche->rechercher($critere, 21);

module/Application/src/Application/Entity/Db/Intervenant.php

+2 −0

Changes for module/Application/src/Application/Entity/Db/Intervenant.php: 2 added lines, 0 removed lines.
Original line number	Diff line number	Diff line
		@@ -1576,6 +1576,8 @@ class Intervenant implements HistoriqueAwareInterface, ResourceInterface, Import
		$hydrator->hydrate($data, $intervenant);
		$intervenant->setValiditeDebut(new \DateTime());
		$intervenant->setValiditeFin(null);
		$intervenant->setHistoDestructeur(null);
		$intervenant->setHistoDestruction(null);

		return $intervenant;
		}

module/Application/src/Application/Provider/Privilege/Privileges.php

+1 −0

Changes for module/Application/src/Application/Provider/Privilege/Privileges.php: 1 added line, 0 removed lines.
Original line number	Diff line number	Diff line
		@@ -138,6 +138,7 @@ class Privileges extends \UnicaenAuth\Provider\Privilege\Privileges
		const INTERVENANT_STATUT_EDITION = 'intervenant-statut-edition';
		const INTERVENANT_STATUT_VISUALISATION = 'intervenant-statut-visualisation';
		const INTERVENANT_SUPPRESSION = 'intervenant-suppression';
		const INTERVENANT_VISUALISATION_HISTORISES = 'intervenant-visualisation-historises';
		const MISE_EN_PAIEMENT_DEMANDE = 'mise-en-paiement-demande';
		const MISE_EN_PAIEMENT_EDITION = 'mise-en-paiement-edition';
		const MISE_EN_PAIEMENT_EXPORT_CSV = 'mise-en-paiement-export-csv';

module/Application/src/Application/View/Helper/Intervenant/IntervenantViewHelper.php

+16 −8

Changes for module/Application/src/Application/View/Helper/Intervenant/IntervenantViewHelper.php: 16 added lines, 8 removed lines.
Original line number	Diff line number	Diff line
		@@ -134,12 +134,10 @@ class IntervenantViewHelper extends AbstractHtmlElement
		$intervenant = $this->getIntervenant();

		$canAddIntervenant = $this->getView()->isAllowed(Privileges::getResourceId(Privileges::INTERVENANT_AJOUT_STATUT));
		$canShowHistorises = $this->getView()->isAllowed(Privileges::getResourceId(Privileges::INTERVENANT_VISUALISATION_HISTORISES));

		$this->getView()->headTitle()->append($intervenant->getNomUsuel())->append($title);
		$title .= ' <small>' . $intervenant . '</small>';
		if ($intervenant->estHistorise()) {
		$title .= ' ' . $this->getView()->tag('span', ['class' => 'text-danger glyphicon glyphicon-warning-sign', 'title' => 'Intervenant historisé'])->text('');
		}

		echo $this->getView()->tag('h1', ['class' => 'page-header'])->open();
		echo $title . '<br />';
		@@ -148,16 +146,26 @@ class IntervenantViewHelper extends AbstractHtmlElement
		?>
		<nav class="navbar navbar-default intervenant-statuts">
		<ul class="nav navbar-nav">
		<?php foreach ($statuts as $intervenantId => $iStatut): ?>
		<li<?= ($iStatut == $intervenant) ? ' class="active"' : ' title="Cliquez pour afficher"' ?>>
		<?php foreach ($statuts as $intervenantId => $iStatut): if ($canShowHistorises \|\| $iStatut->estNonHistorise() \|\| $iStatut == $intervenant): ?>
		<?php
		$attrs = ['class' => ''];
		if ($iStatut == $intervenant) {
		$attrs['class'] = "active";
		} else {
		$attrs['title'] = 'Cliquez pour afficher';
		}
		if ($iStatut->estHistorise()) {
		$attrs['class'] .= ' historise';
		}
		echo $this->getView()->tag('li', $attrs)->open(); ?>
		<a href="<?= $this->getView()->url(null, ['intervenant' => $intervenantId]); ?>">
		<span class="type-intervenant"><?= $iStatut->getStatut()->getTypeIntervenant() ?></span>
		<span class="validite-intervenant"><?= $iStatut->getValidite(); ?></span><br/>
		<span class="statut-intervenant"><?= $iStatut->getStatut()->getLibelle() ?></span>

		<?php if ($iStatut->estHistorise()) echo $this->getView()->tag('span', ['class' => 'text-danger glyphicon glyphicon-warning-sign', 'title' => 'Intervenant historisé'])->text('') ?>
		</a>
		</li>
		<?php endforeach; ?>
		<?php endif; endforeach; ?>
		<?php if ($canAddIntervenant && $intervenant->getId()): ?>
		<li class="ajout-intervenant">
		<a href="<?= $this->getView()->url('intervenant/dupliquer', ['intervenant' => $intervenant->getId()]); ?>"
		@@ -179,7 +187,7 @@ class IntervenantViewHelper extends AbstractHtmlElement
		$intervernants = $this->getServiceIntervenant()->getIntervenants($this->getIntervenant());
		$statuts = [];
		foreach ($intervernants as $intervenant) {
		if ($intervenant->estNonHistorise() && $intervenant->getStatut()) {
		if ($intervenant->getStatut()) {
		$statuts[$intervenant->getId()] = $intervenant;
		}
		}