Merge branches 'Centres-cout' and 'master' of git.unicaen.fr:open-source/OSE into Centres-cout (1276867f) · Commits · open-source / OSE

module/Application/config/centre-cout.config.php

+1 −1

Original line number	Diff line number	Diff line
		@@ -79,7 +79,7 @@ return [
		'administration' => [
		'pages' => [
		'centre-cout' => [
		'label' => 'Centres de Couts',
		'label' => 'Centres de Coûts',
		'icon' => 'fa fa-graduation-cap',
		'route' => 'centre-cout',
		'resource' => PrivilegeController::getResourceId('Application\Controller\CentreCout', 'index'),

module/Application/src/Application/Controller/CentreCoutController.php

+6 −6

Original line number	Diff line number	Diff line
		@@ -45,10 +45,10 @@ class CentreCoutController extends AbstractController

		$form = $this->getFormCentreCoutSaisie();
		if (empty($centreCout)) {
		$title = 'Création d\'un nouveau Centre de Cout';
		$title = 'Création d\'un nouveau Centre de Coûts';
		$centreCout = $this->getServiceCentreCout()->newEntity();
		} else {
		$title = 'Édition d\'une Centre de Cout';
		$title = 'Édition d\'un Centre de Coûts';
		}

		$form->bindRequestSave($centreCout, $this->getRequest(), function (CentreCout $fr) {
		@@ -70,7 +70,7 @@ class CentreCoutController extends AbstractController

		try {
		$this->getServiceCentreCout()->delete($centreCout);
		$this->flashMessenger()->addSuccessMessage("Centre de Cout supprimé avec succès.");
		$this->flashMessenger()->addSuccessMessage("Centre de Coûts supprimé avec succès.");
		} catch (\Exception $e) {
		$this->flashMessenger()->addErrorMessage(DbException::translate($e)->getMessage());
		}
		@@ -87,11 +87,11 @@ class CentreCoutController extends AbstractController

		$form = $this->getFormCentreCoutStructureSaisie();
		if (empty($centreCoutStructure)) {
		$title = 'Création d\'une structure pour le Centre de Cout';
		$title = 'Création d\'une structure pour le Centre de Coûts';
		$centreCoutStructure = $this->getServiceCentreCoutStructure()->newEntity()
		->setCentreCout($centreCout);
		} else {
		$title = 'Édition d\'une structure pour le Centre de Cout';
		$title = 'Édition d\'une structure pour le Centre de Coûts';
		}

		$form->bindRequestSave($centreCoutStructure, $this->getRequest(), function (CentreCoutStructure $ccs) {
		@@ -113,7 +113,7 @@ class CentreCoutController extends AbstractController

		try {
		$this->getServiceCentreCoutStructure()->delete($centreCoutStructure);
		$this->flashMessenger()->addSuccessMessage("Structure plus liée au centre de cout.");
		$this->flashMessenger()->addSuccessMessage("Structure plus liée au centre de coûts.");
		} catch (\Exception $e) {
		$this->flashMessenger()->addErrorMessage(DbException::translate($e)->getMessage());
		}

module/Application/src/Application/Form/CentreCout/CentreCoutSaisieForm.php

+9 −9

Original line number	Diff line number	Diff line
		@@ -203,12 +203,12 @@ class CentreCoutHydrator implements HydratorInterface
		public function extract($object)
		{
		$data = [
		'id' => $object->getId()
		, 'code' => $object->getCode()
		, 'libelle' => $object->getLibelle()
		, 'source-code' => $object->getSourceCode()
		, 'unite-budgetaire' => $object->getUniteBudgetaire()
		, 'activite' => ($s = $object->getActivite()) ? $s->getId() : null,
		'id' => $object->getId(),
		'code' => $object->getCode(),
		'libelle' => $object->getLibelle(),
		'source-code' => $object->getSourceCode(),
		'unite-budgetaire' => $object->getUniteBudgetaire(),
		'activite' => ($s = $object->getActivite()) ? $s->getId() : null,
		'type-ressource' => ($s = $object->getTypeRessource()) ? $s->getId() : null,
		'parent' => ($s = $object->getParent()) ? $s->getId() : null,

module/Application/src/Application/Form/CentreCout/CentreCoutStructureSaisieForm.php

+20 −6

Original line number	Diff line number	Diff line
		@@ -46,8 +46,11 @@ class CentreCoutStructureSaisieForm extends AbstractForm
		],
		'type' => 'Select',
		]);

		$this->get('structure')
		->setValueOptions(\UnicaenApp\Util::collectionAsOptions($this->getServiceStructure()->getList()));
		->setEmptyOption("(Aucun)")
		->setValueOptions(\UnicaenApp\Util::collectionAsOptions($this->getStructures()));

		$this->add([
		'name' => 'code',
		'options' => [
		@@ -87,6 +90,17 @@ class CentreCoutStructureSaisieForm extends AbstractForm



		public function getStructures()
		{
		$serviceStructure = $this->getServiceStructure();
		$qb = $serviceStructure->finderByHistorique();
		$structures = $serviceStructure->getList($qb);

		return $structures;
		}



		/**
		* Should return an array specification compatible with
		* {@link Zend\InputFilter\Factory::createInputFilter()}.
		@@ -157,11 +171,11 @@ class CentreCoutStructureHydrator implements HydratorInterface
		public function extract($object)
		{
		$data = [
		'id' => $object->getId()
		, 'structure' => ($s = $object->getStructure()) ? $s->getId() : null
		, 'code' => $object->getSourceCode()
		, 'centre-cout' => $object->getCentreCout()->getId()
		, 'unite-budgetaire' => $object->getUniteBudgetaire()
		'id' => $object->getId(),
		'structure' => ($s = $object->getStructure()) ? $s->getId() : null,
		'code' => $object->getSourceCode(),
		'centre-cout' => $object->getCentreCout()->getId(),
		'unite-budgetaire' => $object->getUniteBudgetaire(),
		];

		return $data;

module/Application/view/application/centre-cout/index.phtml

+8 −8

Original line number	Diff line number	Diff line
		@@ -7,7 +7,7 @@

		use Application\Provider\Privilege\Privileges;

		$this->headTitle()->append("Centres de cout");
		$this->headTitle()->append("Centres de coûts");

		$canEdit = $this->isAllowed(Privileges::getResourceId(Privileges::CENTRES_COUTS_ADMINISTRATION_EDITION));

		@@ -60,11 +60,11 @@ while ($i < $nTblListe) {
		<td><?php if (($fr->getSource()->getLibelle() == 'OSE') && ($canEdit)) { ?>
		<a class="ajax-modal" data-event="centre-cout-saisie"
		href="<?= $this->url('centre-cout/saisie', ['centre-cout' => $fr->getId()]) ?>"
		title="Modifier la Centre de Cout">
		title="Modifier la Centre de Coûts">
		<span class="glyphicon glyphicon-edit"></span></a>
		<a class="pop-ajax"
		href="<?= $this->url('centre-cout/delete', ['centre-cout' => $fr->getId()]) ?>"
		title="Supprimer la Centre de Cout"
		title="Supprimer la Centre de Coûts"
		data-content="<p class='lead text-danger'><strong>Attention!</strong> Confirmez-vous cette suppression ?</p>"
		data-confirm="true"
		data-confirm-button="Oui"
		@@ -105,7 +105,7 @@ while ($i < $nTblListe) {
		<span class="glyphicon glyphicon-edit"></span></a>
		<a class="pop-ajax"
		href="<?= $this->url('centre-cout/delete-structure', ['centre-cout-structure' => $ccs->getId()]) ?>"
		title="Supprimer la sructure du Centre de Cout"
		title="Supprimer la sructure du Centre de Coûts"
		data-content="<p class='lead text-danger'><strong>Attention!</strong> Confirmez-vous cette suppression ?</p>"
		data-confirm="true"
		data-confirm-button="Oui"
		@@ -142,11 +142,11 @@ while ($i < $nTblListe) {
		<td style="text-align:center;width:1px;white-space: nowrap">
		<a class="ajax-modal" data-event="centre-cout-saisie"
		href="<?= $this->url('centre-cout/saisie', ['centre-cout' => $frf->getId()]) ?>"
		title="Modifier la Centre de Cout">
		title="Modifier la Centre de Coûts">
		<span class="glyphicon glyphicon-edit"></span></a>
		<a class="pop-ajax"
		href="<?= $this->url('centre-cout/delete', ['centre-cout' => $frf->getId()]) ?>"
		title="Supprimer la Centre de Cout"
		title="Supprimer le Centre de Coûts"
		data-content="<p class='lead text-danger'><strong>Attention!</strong> Confirmez-vous cette suppression ?</p>"
		data-confirm="true"
		data-confirm-button="Oui"
		@@ -186,7 +186,7 @@ while ($i < $nTblListe) {
		<span class="glyphicon glyphicon-edit"></span></a>
		<a class="pop-ajax"
		href="<?= $this->url('centre-cout/delete-structure', ['centre-cout-structure' => $ccs->getId()]) ?>"
		title="Supprimer la sructure du Centre de Cout"
		title="Supprimer la sructure du Centre de Coûts"
		data-content="<p class='lead text-danger'><strong>Attention!</strong> Confirmez-vous cette suppression ?</p>"
		data-confirm="true"
		data-confirm-button="Oui"
		@@ -220,7 +220,7 @@ while ($i < $nTblListe) {
		<?php if ($canEdit): ?>
		<a class="btn btn-primary ajax-modal" data-event="centre-cout-saisie"
		href="<?= $this->url('centre-cout/saisie') ?>"
		title="Ajouter un Centre de Cout">
		title="Ajouter un Centre de Coûts">
		<span class="glyphicon glyphicon-edit"></span>
		Ajouter un Centre de cout</a>