Loading module/Mission/config/module.config.php +30 −12 Changes for module/Mission/config/module.config.php: 30 added lines, 12 removed lines. Original line number Diff line number Diff line Loading @@ -6,7 +6,7 @@ use Application\Entity\Db\WfEtape; use Application\Provider\Privilege\Privileges; use Laminas\ServiceManager\Factory\InvokableFactory; use Mission\Controller\MissionController; use Mission\Controller\TauxMissionController; use Mission\Controller\MissionTauxController; use Mission\Service\MissionTauxService; use Mission\Service\MissionTauxServiceFactory; use UnicaenAuth\Assertion\AssertionFactory; Loading Loading @@ -58,14 +58,32 @@ return [ ], ], ], 'taux-missions' => [ 'route' => '/taux-missions', 'controller' => TauxMissionController::class, 'missions-taux' => [ 'route' => '/missions-taux', 'controller' => MissionTauxController::class, 'action' => 'index', 'may_terminate' => true, 'child_routes' => [ /* Placez ici vos routes filles */ 'saisir' => [ 'route' => '/saisir[/:tauxRemu]', 'controller' => MissionTauxController::class, 'action' => 'saisir', ], 'supprimer' => [ 'route' => '/supprimer/:tauxRemu', 'controller' => MissionTauxController::class, 'action' => 'supprimer', ], 'saisir-valeur' => [ 'route' => '/saisir-valeur[/:tauxRemuValeur]', 'controller' => MissionTauxController::class, 'action' => 'saisirValeur', ], 'supprimer-valeur' => [ 'route' => '/supprimer-valeur/:tauxRemuValeur', 'controller' => MissionTauxController::class, 'action' => 'supprimerValeur', ], ], ], ], Loading @@ -92,10 +110,10 @@ return [ 'pages' => [ 'intervenants' => [ 'pages' => [ 'taux-mission' => [ 'missions-taux' => [ 'label' => "Taux de mission", 'route' => 'taux-missions', 'resource' => PrivilegeController::getResourceId(TauxMissionController::class, 'index'), 'route' => 'missions-taux', 'resource' => PrivilegeController::getResourceId(MissionTauxController::class, 'index'), 'order' => 60, ], ], Loading Loading @@ -149,8 +167,8 @@ return [ //'assertion' => Assertion\MissionAssertion::class, ], [ 'controller' => TauxMissionController::class, 'action' => ['index'], 'controller' => MissionTauxController::class, 'action' => ['index','supprimer','supprimerValeur','saisir','saisirValeur'], 'privileges' => [ Privileges::MISSION_VISUALISATION, ], Loading @@ -159,7 +177,7 @@ return [ 'controllers' => [ MissionController::class => Controller\MissionControllerFactory::class, TauxMissionController::class => Controller\TauxMissionControllerFactory::class, MissionTauxController::class => Controller\MissionTauxControllerFactory::class, ], 'services' => [ Loading module/Mission/src/Controller/MissionTauxController.php +71 Changes for module/Mission/src/Controller/MissionTauxController.php: 71 added lines, 0 removed lines. Original line number Diff line number Diff line <?php namespace Mission\Controller; use Application\Controller\AbstractController; use Mission\Entity\Db\MissionTauxRemu; use Mission\Service\MissionTauxServiceAwareTrait; use Application\Service\Traits\ContextServiceAwareTrait; use UnicaenApp\View\Model\MessengerViewModel; /** * Description of MissionTauxController * * @author Florian Joriot <florian.joriot at unicaen.fr> */ class MissionTauxController extends AbstractController { use MissionTauxServiceAwareTrait; use ContextServiceAwareTrait; public function indexAction() { $tauxMissions = $this->getServiceMissionTaux()->getTauxRemus(); $annee = $this->getServiceContext()->getAnnee(); return compact('tauxMissions', 'annee'); } public function saisirAction(): array { $tauxMissions = $this->getServiceMissionTaux()->getTauxRemus(); $annee = $this->getServiceContext()->getAnnee(); return compact('tauxMissions', 'annee'); } public function saisirValeurAction(): array { $tauxMissions = $this->getServiceMissionTaux()->getTauxRemus(); $annee = $this->getServiceContext()->getAnnee(); return compact('tauxMissions', 'annee'); } public function supprimerAction(): MessengerViewModel { echo "test"; return new MessengerViewModel(); } public function supprimerValeurAction(): MessengerViewModel { return new MessengerViewModel(); } } module/Mission/src/Controller/TauxMissionControllerFactory.php→module/Mission/src/Controller/MissionTauxControllerFactory.php +7 −6 Changes for module/Mission/src/Controller/MissionTauxControllerFactory.php: 7 added lines, 6 removed lines. Original line number Diff line number Diff line Loading @@ -2,28 +2,29 @@ namespace Mission\Controller; use Application\Service\ContextService; use Mission\Service\MissionTauxService; use Psr\Container\ContainerInterface; /** * Description of TauxMissionControllerFactory * Description of MissionTauxControllerFactory * * @author Florian Joriot <florian.joriot at unicaen.fr> */ class TauxMissionControllerFactory class MissionTauxControllerFactory { /** * @param ContainerInterface $container * @param string $requestedName * @param array|null $options * * @return TauxMissionController * @return MissionTauxController */ public function __invoke(ContainerInterface $container, $requestedName, $options = null): TauxMissionController public function __invoke(ContainerInterface $container, $requestedName, $options = null): MissionTauxController { $controller = new TauxMissionController; $controller = new MissionTauxController; $controller->setServiceMissionTaux($container->get(MissionTauxService::class)); $controller->setServiceContext($container->get(ContextService::class)); return $controller; } } Loading module/Mission/src/Controller/TauxMissionController.php −27 File deleted. Show changes module/Mission/view/mission/mission-taux/index.phtml +111 Changes for module/Mission/view/mission/mission-taux/index.phtml: 111 added lines, 0 removed lines. Original line number Diff line number Diff line <?php /** * @var $this \Application\View\Renderer\PhpRenderer */ use Mission\Entity\Db\MissionTauxRemu; use Mission\Entity\Db\MissionTauxRemuValeur; $this->headTitle()->append("Gestion des taux de missions"); echo $this->messenger()->addCurrentMessagesFromFlashMessenger(); ?> <h1 class="page-header">Gestion des taux de missions</h1> <?php /** @var MissionTauxRemu[] $tauxMissions */ /** @var string $annee */ $anneeSplit = explode('/', $annee); foreach ($tauxMissions as $tauxRemu): ?> <div class="card bg-default"> <div class="card-header"><?= $tauxRemu->getLibelle(); ?> (<?= $tauxRemu->getCode(); ?>) <div class="float-end"> <a class="ajax-modal " data-event="taux-edition" href="<?= $this->url("missions-taux/saisir", ['tauxRemu' => $tauxRemu->getId()]) ?>" title="Modifier le taux"><i class="fas fa-pen-to-square"></i></a> <a class="pop-ajax " data-title="Suppression d'un taux" data-content="Êtes-vous sur de vouloir supprimer" data-confirm="true" data-submit-reload="true" href="<?= $this->url("missions-taux/supprimer", ['tauxRemu' => $tauxRemu->getId()]) ?>" title="Supprimer le taux"><i class="fas fa-trash-can"></i></a> </div> </div> <table class="table table-bordered table-sm"> <thead> <tr> <th style="text-align: center" width="40%">Valeur de l'année <?php echo $annee ?></th> <th style="text-align: center" width="40%">Date début</th> <th style="text-align: center">Action</th> </tr> </thead> <tbody> <?php $tauxRemuValeurs = $tauxRemu->getTauxRemuValeurs(); $dateDebutAnnee = "01-09-" . $anneeSplit[0]; $dateFinAnnee = "01-09-" . $anneeSplit[1]; $dateValide = false; $tauxAutreAnnee = ""; foreach ($tauxRemuValeurs as $tauxRemuValeur): /** @var MissionTauxRemuValeur $tauxRemuValeur */ if ($tauxRemuValeur->getDateEffet() >= new DateTime($dateDebutAnnee) && $tauxRemuValeur->getDateEffet() < new DateTime($dateFinAnnee)): $dateValide = true; ?> <tr> <td style="text-align: center"><?php echo $tauxRemuValeur->getValeur() ?></td> <?php $newDate = $tauxRemuValeur->getDateEffet()->format('d/m/Y'); ?> <td style="text-align: center"><?php echo $newDate ?></td> <td style="text-align: center"> <a class="ajax-modal " data-event="taux-valeur-edition" href="<?= $this->url("missions-taux/saisir-valeur", ['tauxRemuValeur' => $tauxRemuValeur->getId()]) ?>" title="Modifier la valeur du taux"><i class="fas fa-pen-to-square"></i></a> <a class="pop-ajax " data-title="Suppression d'une valeur de taux" data-content="Êtes-vous sur de vouloir supprimer" data-confirm="true" data-submit-reload="true" href="<?= $this->url("missions-taux/supprimer-valeur", ['tauxRemuValeur' => $tauxRemuValeur->getId()]) ?>" title="Supprimer la valeur du taux"><i class="fas fa-trash-can"></i></a></td> </tr> <?php else: $tauxAutreAnnee = $tauxAutreAnnee . "valeur: " . $tauxRemuValeur->getValeur() . " - Date: " . $tauxRemuValeur->getDateEffet()->format('d/m/Y') . "\n"; endif; endforeach; if ($tauxAutreAnnee != "") : ?> <td style="text-align: center" title="<?= $tauxAutreAnnee ?>">Valeur des autres années <i class="fa-solid fa-circle-question"></i></td> <?php endif; ?> </tbody> </table> <div class="card-body"> <div> <button class="btn btn-primary ajax-modal" data-event="taux-valeur-edition" href="<?= $this->url("missions-taux/saisir-valeur", []) ?>" title="Ajouter une valeur au taux"> Ajouter une valeur au taux </button> </div> </div> </div> <?php endforeach; ?> <div> <button class="btn btn-primary"> Ajouter un taux </button> </div> <script type="text/javascript"> $(function () { $("body").on("taux-edition", function (event, data) { window.location.reload(); }); }); $(function () { $("body").on("taux-valeur-edition", function (event, data) { window.location.reload(); }); }); </script> No newline at end of file Loading
module/Mission/config/module.config.php +30 −12 Changes for module/Mission/config/module.config.php: 30 added lines, 12 removed lines. Original line number Diff line number Diff line Loading @@ -6,7 +6,7 @@ use Application\Entity\Db\WfEtape; use Application\Provider\Privilege\Privileges; use Laminas\ServiceManager\Factory\InvokableFactory; use Mission\Controller\MissionController; use Mission\Controller\TauxMissionController; use Mission\Controller\MissionTauxController; use Mission\Service\MissionTauxService; use Mission\Service\MissionTauxServiceFactory; use UnicaenAuth\Assertion\AssertionFactory; Loading Loading @@ -58,14 +58,32 @@ return [ ], ], ], 'taux-missions' => [ 'route' => '/taux-missions', 'controller' => TauxMissionController::class, 'missions-taux' => [ 'route' => '/missions-taux', 'controller' => MissionTauxController::class, 'action' => 'index', 'may_terminate' => true, 'child_routes' => [ /* Placez ici vos routes filles */ 'saisir' => [ 'route' => '/saisir[/:tauxRemu]', 'controller' => MissionTauxController::class, 'action' => 'saisir', ], 'supprimer' => [ 'route' => '/supprimer/:tauxRemu', 'controller' => MissionTauxController::class, 'action' => 'supprimer', ], 'saisir-valeur' => [ 'route' => '/saisir-valeur[/:tauxRemuValeur]', 'controller' => MissionTauxController::class, 'action' => 'saisirValeur', ], 'supprimer-valeur' => [ 'route' => '/supprimer-valeur/:tauxRemuValeur', 'controller' => MissionTauxController::class, 'action' => 'supprimerValeur', ], ], ], ], Loading @@ -92,10 +110,10 @@ return [ 'pages' => [ 'intervenants' => [ 'pages' => [ 'taux-mission' => [ 'missions-taux' => [ 'label' => "Taux de mission", 'route' => 'taux-missions', 'resource' => PrivilegeController::getResourceId(TauxMissionController::class, 'index'), 'route' => 'missions-taux', 'resource' => PrivilegeController::getResourceId(MissionTauxController::class, 'index'), 'order' => 60, ], ], Loading Loading @@ -149,8 +167,8 @@ return [ //'assertion' => Assertion\MissionAssertion::class, ], [ 'controller' => TauxMissionController::class, 'action' => ['index'], 'controller' => MissionTauxController::class, 'action' => ['index','supprimer','supprimerValeur','saisir','saisirValeur'], 'privileges' => [ Privileges::MISSION_VISUALISATION, ], Loading @@ -159,7 +177,7 @@ return [ 'controllers' => [ MissionController::class => Controller\MissionControllerFactory::class, TauxMissionController::class => Controller\TauxMissionControllerFactory::class, MissionTauxController::class => Controller\MissionTauxControllerFactory::class, ], 'services' => [ Loading
module/Mission/src/Controller/MissionTauxController.php +71 Changes for module/Mission/src/Controller/MissionTauxController.php: 71 added lines, 0 removed lines. Original line number Diff line number Diff line <?php namespace Mission\Controller; use Application\Controller\AbstractController; use Mission\Entity\Db\MissionTauxRemu; use Mission\Service\MissionTauxServiceAwareTrait; use Application\Service\Traits\ContextServiceAwareTrait; use UnicaenApp\View\Model\MessengerViewModel; /** * Description of MissionTauxController * * @author Florian Joriot <florian.joriot at unicaen.fr> */ class MissionTauxController extends AbstractController { use MissionTauxServiceAwareTrait; use ContextServiceAwareTrait; public function indexAction() { $tauxMissions = $this->getServiceMissionTaux()->getTauxRemus(); $annee = $this->getServiceContext()->getAnnee(); return compact('tauxMissions', 'annee'); } public function saisirAction(): array { $tauxMissions = $this->getServiceMissionTaux()->getTauxRemus(); $annee = $this->getServiceContext()->getAnnee(); return compact('tauxMissions', 'annee'); } public function saisirValeurAction(): array { $tauxMissions = $this->getServiceMissionTaux()->getTauxRemus(); $annee = $this->getServiceContext()->getAnnee(); return compact('tauxMissions', 'annee'); } public function supprimerAction(): MessengerViewModel { echo "test"; return new MessengerViewModel(); } public function supprimerValeurAction(): MessengerViewModel { return new MessengerViewModel(); } }
module/Mission/src/Controller/TauxMissionControllerFactory.php→module/Mission/src/Controller/MissionTauxControllerFactory.php +7 −6 Changes for module/Mission/src/Controller/MissionTauxControllerFactory.php: 7 added lines, 6 removed lines. Original line number Diff line number Diff line Loading @@ -2,28 +2,29 @@ namespace Mission\Controller; use Application\Service\ContextService; use Mission\Service\MissionTauxService; use Psr\Container\ContainerInterface; /** * Description of TauxMissionControllerFactory * Description of MissionTauxControllerFactory * * @author Florian Joriot <florian.joriot at unicaen.fr> */ class TauxMissionControllerFactory class MissionTauxControllerFactory { /** * @param ContainerInterface $container * @param string $requestedName * @param array|null $options * * @return TauxMissionController * @return MissionTauxController */ public function __invoke(ContainerInterface $container, $requestedName, $options = null): TauxMissionController public function __invoke(ContainerInterface $container, $requestedName, $options = null): MissionTauxController { $controller = new TauxMissionController; $controller = new MissionTauxController; $controller->setServiceMissionTaux($container->get(MissionTauxService::class)); $controller->setServiceContext($container->get(ContextService::class)); return $controller; } } Loading
module/Mission/view/mission/mission-taux/index.phtml +111 Changes for module/Mission/view/mission/mission-taux/index.phtml: 111 added lines, 0 removed lines. Original line number Diff line number Diff line <?php /** * @var $this \Application\View\Renderer\PhpRenderer */ use Mission\Entity\Db\MissionTauxRemu; use Mission\Entity\Db\MissionTauxRemuValeur; $this->headTitle()->append("Gestion des taux de missions"); echo $this->messenger()->addCurrentMessagesFromFlashMessenger(); ?> <h1 class="page-header">Gestion des taux de missions</h1> <?php /** @var MissionTauxRemu[] $tauxMissions */ /** @var string $annee */ $anneeSplit = explode('/', $annee); foreach ($tauxMissions as $tauxRemu): ?> <div class="card bg-default"> <div class="card-header"><?= $tauxRemu->getLibelle(); ?> (<?= $tauxRemu->getCode(); ?>) <div class="float-end"> <a class="ajax-modal " data-event="taux-edition" href="<?= $this->url("missions-taux/saisir", ['tauxRemu' => $tauxRemu->getId()]) ?>" title="Modifier le taux"><i class="fas fa-pen-to-square"></i></a> <a class="pop-ajax " data-title="Suppression d'un taux" data-content="Êtes-vous sur de vouloir supprimer" data-confirm="true" data-submit-reload="true" href="<?= $this->url("missions-taux/supprimer", ['tauxRemu' => $tauxRemu->getId()]) ?>" title="Supprimer le taux"><i class="fas fa-trash-can"></i></a> </div> </div> <table class="table table-bordered table-sm"> <thead> <tr> <th style="text-align: center" width="40%">Valeur de l'année <?php echo $annee ?></th> <th style="text-align: center" width="40%">Date début</th> <th style="text-align: center">Action</th> </tr> </thead> <tbody> <?php $tauxRemuValeurs = $tauxRemu->getTauxRemuValeurs(); $dateDebutAnnee = "01-09-" . $anneeSplit[0]; $dateFinAnnee = "01-09-" . $anneeSplit[1]; $dateValide = false; $tauxAutreAnnee = ""; foreach ($tauxRemuValeurs as $tauxRemuValeur): /** @var MissionTauxRemuValeur $tauxRemuValeur */ if ($tauxRemuValeur->getDateEffet() >= new DateTime($dateDebutAnnee) && $tauxRemuValeur->getDateEffet() < new DateTime($dateFinAnnee)): $dateValide = true; ?> <tr> <td style="text-align: center"><?php echo $tauxRemuValeur->getValeur() ?></td> <?php $newDate = $tauxRemuValeur->getDateEffet()->format('d/m/Y'); ?> <td style="text-align: center"><?php echo $newDate ?></td> <td style="text-align: center"> <a class="ajax-modal " data-event="taux-valeur-edition" href="<?= $this->url("missions-taux/saisir-valeur", ['tauxRemuValeur' => $tauxRemuValeur->getId()]) ?>" title="Modifier la valeur du taux"><i class="fas fa-pen-to-square"></i></a> <a class="pop-ajax " data-title="Suppression d'une valeur de taux" data-content="Êtes-vous sur de vouloir supprimer" data-confirm="true" data-submit-reload="true" href="<?= $this->url("missions-taux/supprimer-valeur", ['tauxRemuValeur' => $tauxRemuValeur->getId()]) ?>" title="Supprimer la valeur du taux"><i class="fas fa-trash-can"></i></a></td> </tr> <?php else: $tauxAutreAnnee = $tauxAutreAnnee . "valeur: " . $tauxRemuValeur->getValeur() . " - Date: " . $tauxRemuValeur->getDateEffet()->format('d/m/Y') . "\n"; endif; endforeach; if ($tauxAutreAnnee != "") : ?> <td style="text-align: center" title="<?= $tauxAutreAnnee ?>">Valeur des autres années <i class="fa-solid fa-circle-question"></i></td> <?php endif; ?> </tbody> </table> <div class="card-body"> <div> <button class="btn btn-primary ajax-modal" data-event="taux-valeur-edition" href="<?= $this->url("missions-taux/saisir-valeur", []) ?>" title="Ajouter une valeur au taux"> Ajouter une valeur au taux </button> </div> </div> </div> <?php endforeach; ?> <div> <button class="btn btn-primary"> Ajouter un taux </button> </div> <script type="text/javascript"> $(function () { $("body").on("taux-edition", function (event, data) { window.location.reload(); }); }); $(function () { $("body").on("taux-valeur-edition", function (event, data) { window.location.reload(); }); }); </script> No newline at end of file