Correction du bug sur l'interface des centres de coûts (91767e9a) · Commits · JACQUOT Frederic / OSE

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

+13 −13

Original line number	Diff line number	Diff line
		@@ -22,9 +22,9 @@ return [
		'delete' => [
		'type' => 'Segment',
		'options' => [
		'route' => '/delete/:centre-cout',
		'route' => '/delete/:centreCout',
		'constraints' => [
		'centre-cout' => '[0-9]*',
		'centreCout' => '[0-9]*',
		],
		'defaults' => [
		'action' => 'delete',
		@@ -34,9 +34,9 @@ return [
		'saisie' => [
		'type' => 'Segment',
		'options' => [
		'route' => '/saisie/[:centre-cout]',
		'route' => '/saisie/[:centreCout]',
		'constraints' => [
		'centre-cout' => '[0-9]*',
		'centreCout' => '[0-9]*',
		],
		'defaults' => [
		'action' => 'saisie',
		@@ -46,9 +46,9 @@ return [
		'delete-structure' => [
		'type' => 'Segment',
		'options' => [
		'route' => '/delete-structure/:centre-cout-structure',
		'route' => '/delete-structure/:centreCoutStructure',
		'constraints' => [
		'centre-cout-structure' => '[0-9]*',
		'centreCoutStructure' => '[0-9]*',
		],
		'defaults' => [
		'action' => 'delete-structure',
		@@ -58,10 +58,10 @@ return [
		'saisie-structure' => [
		'type' => 'Segment',
		'options' => [
		'route' => '/saisie-structure/:centre-cout/[:centre-cout-structure]',
		'route' => '/saisie-structure/:centreCout/[:centreCoutStructure]',
		'constraints' => [
		'centre-cout' => '[0-9]*',
		'saisie-sructure' => '[0-9]*',
		'centreCout' => '[0-9]*',
		'centreCoutStructure' => '[0-9]*',
		],
		'defaults' => [
		'action' => 'saisie-structure',

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

+18 −9

Original line number	Diff line number	Diff line
		@@ -18,6 +18,7 @@ class CentreCoutController extends AbstractController
		use CentreCoutStructureSaisieFormAwareTrait;



		public function indexAction()
		{
		$this->em()->getFilters()->enable('historique')->init([
		@@ -39,7 +40,7 @@ class CentreCoutController extends AbstractController
		{
		/* @var $centreCout CentreCout */

		$centreCout = $this->getEvent()->getParam('centre-cout');
		$centreCout = $this->getEvent()->getParam('centreCout');

		$form = $this->getFormCentreCoutSaisie();
		if (empty($centreCout)) {
		@@ -61,9 +62,11 @@ class CentreCoutController extends AbstractController
		return compact('form', 'title');
		}



		public function deleteAction()
		{
		$centreCout = $this->getEvent()->getParam('centre-cout');
		$centreCout = $this->getEvent()->getParam('centreCout');

		try {
		$this->getServiceCentreCout()->delete($centreCout);
		@@ -71,16 +74,19 @@ class CentreCoutController extends AbstractController
		} catch (\Exception $e) {
		$this->flashMessenger()->addErrorMessage($this->translate($e));
		}

		return new MessengerViewModel(compact('centreCout'));
		}



		public function saisieStructureAction()
		{
		/* @var $centreCout CentreCout */
		/* @var $centreCoutStructure CentreCoutStructure */

		$centreCout = $this->getEvent()->getParam('centre-cout');
		$centreCoutStructure = $this->getEvent()->getParam('centre-cout-structure');
		$centreCout = $this->getEvent()->getParam('centreCout');
		$centreCoutStructure = $this->getEvent()->getParam('centreCoutStructure');

		$form = $this->getFormCentreCoutStructureSaisie();
		if (empty($centreCoutStructure)) {
		@@ -103,9 +109,11 @@ class CentreCoutController extends AbstractController
		return compact('form', 'title');
		}



		public function deleteStructureAction()
		{
		$centreCoutStructure = $this->getEvent()->getParam('centre-cout-structure');
		$centreCoutStructure = $this->getEvent()->getParam('centreCoutStructure');

		try {
		$this->getServiceCentreCoutStructure()->delete($centreCoutStructure);
		@@ -113,6 +121,7 @@ class CentreCoutController extends AbstractController
		} catch (\Exception $e) {
		$this->flashMessenger()->addErrorMessage($this->translate($e));
		}

		return new MessengerViewModel(compact('centreCoutStructure'));
		}
		}

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

+4 −4

Original line number	Diff line number	Diff line
		@@ -142,7 +142,7 @@ class CentreCoutStructureHydrator implements HydratorInterface
		$data = [
		'id' => $object->getId(),
		'structure' => ($s = $object->getStructure()) ? $s->getId() : null,
		'centre-cout' => $object->getCentreCout()->getId(),
		'centre-cout' => $object->getCentreCout() ? $object->getCentreCout()->getId() : null,
		];

		return $data;

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

+15 −19

Original line number	Diff line number	Diff line
		@@ -56,13 +56,13 @@ while ($i < $nTblListe) {
		<td><?= $fr->getActivite()->getLibelle() . '<br>' ?></td>
		<td><?= $fr->getTypeRessource() . '<br>' ?></td>
		<td><?= $fr->getUniteBudgetaire() . '<br>' ?></td>
		<td style=" text-align: center;"><?php if (($fr->getSource()->getLibelle() == 'OSE') && ($canEdit)) { ?>
		<td style=" text-align: center;"><?php if ((!$fr->getSource()->getImportable()) && ($canEdit)) { ?>
		<a class="ajax-modal" data-event="centre-cout-saisie"
		href="<?= $this->url('centre-cout/saisie', ['centre-cout' => $fr->getId()]) ?>"
		href="<?= $this->url('centre-cout/saisie', ['centreCout' => $fr->getId()]) ?>"
		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()]) ?>"
		href="<?= $this->url('centre-cout/delete', ['centreCout' => $fr->getId()]) ?>"
		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"
		@@ -80,20 +80,16 @@ while ($i < $nTblListe) {
		foreach ($centreCoutStructures as $ccs) {
		if ($ccs->getCentreCout()->getId() == $fr->getId()) {
		$tblOk = true;
		if (($ccs->getSource()->getLibelle() == 'OSE') && $canEdit) $okActions = true;
		if ((!$ccs->getSource()->getImportable()) && $canEdit) $okActions = true;
		}
		}
		if ($tblOk) { ?>
		<?php foreach ($centreCoutStructures as $ccs) {
		if ($ccs->getCentreCout()->getId() == $fr->getId()) { ?>
		<?= $ccs->getStructure() ?>
		<?php if (($ccs->getSource()->getLibelle() == 'OSE') && $canEdit) { ?>
		<a class="ajax-modal" data-event="centre-cout-saisie"
		href="<?= $this->url('centre-cout/saisie-structure', ['centre-cout' => $fr->getId(), 'centre-cout-structure' => $ccs->getId()]) ?>"
		title="Modifier la structure">
		<span class="glyphicon glyphicon-edit"></span></a>
		<?php if ((!$ccs->getSource()->getImportable()) && $canEdit) { ?>
		<a class="pop-ajax"
		href="<?= $this->url('centre-cout/delete-structure', ['centre-cout-structure' => $ccs->getId()]) ?>"
		href="<?= $this->url('centre-cout/delete-structure', ['centreCoutStructure' => $ccs->getId()]) ?>"
		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"
		@@ -110,7 +106,7 @@ while ($i < $nTblListe) {
		<?php } ?>
		<?php if ($canEdit) { ?>
		<a class="ajax-modal" data-event="centre-cout-saisie"
		href="<?= $this->url('centre-cout/saisie-structure', ['centre-cout' => $fr->getId()]) ?>"
		href="<?= $this->url('centre-cout/saisie-structure', ['centreCout' => $fr->getId()]) ?>"
		title="Ajouter une structure">
		<button type="button" class="btn btn-xs btn-primary">Ajouter une structure</button>
		</a>
		@@ -129,14 +125,14 @@ while ($i < $nTblListe) {
		<td style="word-wrap: break-word ; "><?= $frf->getActivite()->getLibelle() ?></td>
		<td style="word-wrap: break-word ; "><?= $frf->getTypeRessource() ?></td>
		<td style="word-wrap: break-word ; "><?= $frf->getUniteBudgetaire() ?></td>
		<?php if (($frf->getSource()->getLibelle() == 'OSE') && $canEdit) { ?>
		<?php if ((!$frf->getSource()->getImportable()) && $canEdit) { ?>
		<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()]) ?>"
		href="<?= $this->url('centre-cout/saisie', ['centreCout' => $frf->getId()]) ?>"
		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()]) ?>"
		href="<?= $this->url('centre-cout/delete', ['centreCout' => $frf->getId()]) ?>"
		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"
		@@ -154,20 +150,20 @@ while ($i < $nTblListe) {
		foreach ($centreCoutStructures as $ccs) {
		if ($ccs->getCentreCout()->getId() == $frf->getId()) {
		$tblOk = true;
		if (($ccs->getSource()->getLibelle() == 'OSE') && $canEdit) $okActions = true;
		if ((!$ccs->getSource()->getImportable()) && $canEdit) $okActions = true;
		}
		}
		if ($tblOk) {
		foreach ($centreCoutStructures as $ccs) {
		if ($ccs->getCentreCout()->getId() == $frf->getId()) { ?>
		<?= $ccs->getStructure() ?>
		<?php if (($ccs->getSource()->getLibelle() == 'OSE') && $canEdit) { ?>
		<?php if ((!$ccs->getSource()->getImportable()) && $canEdit) { ?>
		<a class="ajax-modal" data-event="centre-cout-saisie"
		href="<?= $this->url('centre-cout/saisie-structure', ['centre-cout' => $fr->getId(), 'centre-cout-structure' => $ccs->getId()]) ?>"
		href="<?= $this->url('centre-cout/saisie-structure', ['centreCout' => $fr->getId(), 'centreCoutStructure' => $ccs->getId()]) ?>"
		title="Modifier la structure">
		<span class="glyphicon glyphicon-edit"></span></a>
		<a class="pop-ajax"
		href="<?= $this->url('centre-cout/delete-structure', ['centre-cout-structure' => $ccs->getId()]) ?>"
		href="<?= $this->url('centre-cout/delete-structure', ['centreCoutStructure' => $ccs->getId()]) ?>"
		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"
		@@ -184,7 +180,7 @@ while ($i < $nTblListe) {
		<?php } ?>
		<?php if ($canEdit) { ?>
		<a class="ajax-modal" data-event="centre-cout-saisie"
		href="<?= $this->url('centre-cout/saisie-structure', ['centre-cout' => $frf->getId()]) ?>"
		href="<?= $this->url('centre-cout/saisie-structure', ['centreCout' => $frf->getId()]) ?>"
		title="Ajouter une structure">
		<button type="button" class="btn btn-xs btn-primary">Ajouter une structure</button>
		</a>