Loading module/Mission/config/module.config.php +4 −7 Changes for module/Mission/config/module.config.php: 4 added lines, 7 removed lines. Original line number Diff line number Diff line Loading @@ -9,8 +9,6 @@ use Mission\Controller\MissionTauxController; use Mission\Service\MissionTauxService; use Mission\Service\MissionTauxServiceFactory; use UnicaenAuth\Assertion\AssertionFactory; use Mission\Service\MissionTauxValeurService; use Mission\Service\MissionTauxValeurServiceFactory; use UnicaenAuth\Guard\PrivilegeController; Loading Loading @@ -71,22 +69,22 @@ return [ 'may_terminate' => true, 'child_routes' => [ 'saisir' => [ 'route' => '/saisir[/:tauxRemu]', 'route' => '/saisir[/:missionTauxRemu]', 'controller' => MissionTauxController::class, 'action' => 'saisir', ], 'supprimer' => [ 'route' => '/supprimer/:tauxRemu', 'route' => '/supprimer/:missionTauxRemu', 'controller' => MissionTauxController::class, 'action' => 'supprimer', ], 'saisir-valeur' => [ 'route' => '/saisir-valeur[/:tauxRemu][/:tauxRemuValeur]', 'route' => '/saisir-valeur[/:missionTauxRemu][/:missionTauxRemuValeur]', 'controller' => MissionTauxController::class, 'action' => 'saisirValeur', ], 'supprimer-valeur' => [ 'route' => '/supprimer-valeur/:tauxRemuValeur', 'route' => '/supprimer-valeur/:missionTauxRemuValeur', 'controller' => MissionTauxController::class, 'action' => 'supprimerValeur', ], Loading Loading @@ -188,7 +186,6 @@ return [ 'services' => [ MissionTauxService::class => MissionTauxServiceFactory::class, MissionTauxValeurService::class => MissionTauxValeurServiceFactory::class, Assertion\MissionAssertion::class => AssertionFactory::class, Service\MissionService::class => Service\MissionServiceFactory::class, ], Loading module/Mission/src/Controller/MissionTauxController.php +21 −19 Changes for module/Mission/src/Controller/MissionTauxController.php: 21 added lines, 19 removed lines. Original line number Diff line number Diff line Loading @@ -6,7 +6,6 @@ use Application\Controller\AbstractController; use Mission\Form\MissionTauxFormAwareTrait; use Mission\Form\MissionTauxValeurFormAwareTrait; use Mission\Service\MissionTauxServiceAwareTrait; use Mission\Service\MissionTauxValeurServiceAwareTrait; use Application\Service\Traits\ContextServiceAwareTrait; use UnicaenApp\View\Model\MessengerViewModel; Loading @@ -18,7 +17,6 @@ use UnicaenApp\View\Model\MessengerViewModel; class MissionTauxController extends AbstractController { use MissionTauxServiceAwareTrait; use MissionTauxValeurServiceAwareTrait; use ContextServiceAwareTrait; use MissionTauxFormAwareTrait; use MissionTauxValeurFormAwareTrait; Loading @@ -37,8 +35,7 @@ class MissionTauxController extends AbstractController public function saisirAction() { $tauxRemuId = $this->params()->fromRoute('tauxRemu'); $tauxRemu = $this->getServiceMissionTaux()->get($tauxRemuId); $tauxRemu = $this->getEvent()->getParam('missionTauxRemu'); $form = $this->getFormMissionTaux(); if (empty($tauxRemu)) { $title = "Création d'un nouveau taux"; Loading @@ -48,7 +45,16 @@ class MissionTauxController extends AbstractController } $form->bindRequestSave($tauxRemu, $this->getRequest(), function () use ($tauxRemu, $form) { $this->getServiceMissionTaux()->save($tauxRemu); $this->em()->persist($tauxRemu); $tauxRemuValeurs = $tauxRemu->getTauxRemuValeurs(); foreach ($tauxRemuValeurs as $tauxRemuValeur) { $tauxRemuValeur->setMissionTauxRemu($tauxRemu); $this->em()->persist($tauxRemuValeur); } $this->em()->flush($tauxRemu); foreach ($tauxRemuValeurs as $tauxRemuValeur) { $this->em()->flush($tauxRemuValeur); } $this->flashMessenger()->addSuccessMessage( "Ajout réussi" ); Loading @@ -62,28 +68,25 @@ class MissionTauxController extends AbstractController public function saisirValeurAction(): array { $tauxRemuValeurId = $this->params()->fromRoute('tauxRemuValeur'); $tauxRemuValeur = $this->getServiceMissionTauxValeur()->get($tauxRemuValeurId); $tauxRemuValeur = $this->getEvent()->getParam('missionTauxRemuValeur'); $form = $this->getFormMissionTauxValeur(); if (empty($tauxRemuValeur)) { $title = "Création d'une nouvelle valeur"; /* @var \Mission\Entity\Db\MissionTauxRemuValeur $tauxRemuValeur */ $tauxRemuValeur = $this->getServiceMissionTauxValeur()->newEntity(); $tauxRemuValeur = $this->getServiceMissionTaux()->newEntityValeur(); } else { $title = "Édition d'une nouvelle valeur"; $title = "Édition d'une valeur"; } if ($tauxRemuValeur->getMissionTauxRemu() == null) { $tauxRemuId = $this->params()->fromRoute('tauxRemu'); $tauxRemu = $this->getServiceMissionTaux()->get($tauxRemuId); $tauxRemuValeur = $tauxRemuValeur->setMissionTauxRemu($tauxRemu); $tauxRemu = $this->getEvent()->getParam('missionTauxRemu'); $tauxRemuValeur->setMissionTauxRemu($tauxRemu); } $form->bindRequestSave($tauxRemuValeur, $this->getRequest(), function () use ($tauxRemuValeur, $form) { $this->getServiceMissionTauxValeur()->save($tauxRemuValeur); $this->em()->persist($tauxRemuValeur); $this->em()->flush($tauxRemuValeur); $this->flashMessenger()->addSuccessMessage( "Ajout réussi" ); Loading @@ -96,7 +99,7 @@ class MissionTauxController extends AbstractController public function supprimerAction(): MessengerViewModel { $tauxRemu = $this->getEvent()->getParam('tauxRemu'); $tauxRemu = $this->getEvent()->getParam('missionTauxRemu'); $this->getServiceMissionTaux()->delete($tauxRemu, true); return new MessengerViewModel(); Loading @@ -108,7 +111,6 @@ class MissionTauxController extends AbstractController { return new MessengerViewModel(); } } module/Mission/src/Controller/MissionTauxControllerFactory.php −2 Changes for module/Mission/src/Controller/MissionTauxControllerFactory.php: 0 added lines, 2 removed lines. Original line number Diff line number Diff line Loading @@ -5,7 +5,6 @@ namespace Mission\Controller; use Application\Service\ContextService; use Mission\Form\MissionTauxForm; use Mission\Service\MissionTauxService; use Mission\Service\MissionTauxValeurService; use Psr\Container\ContainerInterface; /** Loading @@ -26,7 +25,6 @@ class MissionTauxControllerFactory { $controller = new MissionTauxController; $controller->setServiceMissionTaux($container->get(MissionTauxService::class)); $controller->setServiceMissionTauxValeur($container->get(MissionTauxValeurService::class)); $controller->setServiceContext($container->get(ContextService::class)); return $controller; } Loading module/Mission/src/Entity/Db/MissionTauxRemu.php +37 Changes for module/Mission/src/Entity/Db/MissionTauxRemu.php: 37 added lines, 0 removed lines. Original line number Diff line number Diff line Loading @@ -2,6 +2,7 @@ namespace Mission\Entity\Db; use DateTime; use Doctrine\Common\Collections\ArrayCollection; use Doctrine\Common\Collections\Collection; use UnicaenApp\Entity\HistoriqueAwareInterface; Loading Loading @@ -131,4 +132,40 @@ class MissionTauxRemu implements HistoriqueAwareInterface { return $this->getLibelle(); } public function getDerniereValeur(){ $valeurRetour = null; $valeurRetourDate = null; $valeurs = $this->tauxRemuValeurs->getValues(); foreach ($valeurs as $valeur){ if($valeurRetourDate == null || $valeur->getDateEffet() > $valeurRetourDate){ $valeurRetour = $valeur->getValeur(); $valeurRetourDate = $valeur->getDateEffet(); } } return $valeurRetour; } public function getDerniereValeurDate(){ $valeurRetourDate = null; $valeurs = $this->tauxRemuValeurs->getValues(); foreach ($valeurs as $valeur){ if($valeurRetourDate == null || $valeur->getDateEffet() > $valeurRetourDate){ $valeurRetourDate = $valeur->getDateEffet(); } } return $valeurRetourDate; } public function setValeur(DateTime $date, float $valeur){ $tauxRemuValeurProche = $this->getTauxRemuValeur($date); if($tauxRemuValeurProche != null && $tauxRemuValeurProche->getDateEffet() == $date){ $tauxRemuValeurProche->setValeur($valeur); }else{ //new tauxremu $newTauxRemu = new MissionTauxRemuValeur(); $newTauxRemu->setValeur($valeur); $newTauxRemu->setDateEffet($date); $this->addTauxRemuValeur($newTauxRemu); } } } module/Mission/src/Form/MissionTauxForm.php +48 −36 Changes for module/Mission/src/Form/MissionTauxForm.php: 48 added lines, 36 removed lines. Original line number Diff line number Diff line Loading @@ -2,9 +2,13 @@ namespace Mission\Form; use Application\Filter\DateTimeFromString; use Application\Form\AbstractForm; use Application\Hydrator\GenericHydrator; use DateTime; use Laminas\Form\FormInterface; use Mission\Entity\Db\MissionTauxRemu; use Mission\Entity\Db\MissionTauxRemuValeur; use UnicaenImport\Service\Traits\SchemaServiceAwareTrait; class MissionTauxForm extends AbstractForm Loading @@ -13,49 +17,57 @@ class MissionTauxForm extends AbstractForm public function init() { // $ignore = [""]; // $this->add([ // 'type' => 'Text', // 'name' => 'Libelle', // 'options' => [ // 'label' => 'Libelle', // ], // ]); // $this->add([ // 'type' => 'Text', // 'name' => 'Code', // 'options' => [ // 'label' => 'Code', // ], // ]); // $this->add([ // 'type' => 'Text', // 'name' => 'Valeur', // 'options' => [ // 'label' => 'Valeur', // ], // ]); $this->add([ // 'type' => 'DateTime', // 'name' => 'Date', // 'options' => [ // 'label' => 'Date', // ], // ]); $hydratorForm = new missionTauxRemuHydrator($this->getEntityManager()); $this->setHydrator($hydratorForm); $this->spec(MissionTauxRemu::class); $this->build(); $this->addSecurity(); $this->addSubmit(); $this->add([ 'name' => 'date', 'type' => 'Date', 'options' => [ 'label' => 'Date d\'effet', ], ]); $this->add([ 'name' => 'submit', 'type' => 'Submit', 'attributes' => [ 'value' => 'Enregistrer', 'class' => 'btn btn-primary btn-save', ], ]); return $this; } } public function bind($object, $flags = FormInterface::VALUES_NORMALIZED) class missionTauxRemuHydrator extends GenericHydrator { /* @var $object MissionTauxRemu */ parent::bind($object, $flags); return $this; public function extract($object): array { $data = [ 'id' => $object->getId(), 'code' => $object->getCode(), 'libelle' => $object->getLibelle(), 'valeur' => $object->getDerniereValeur(), 'date' => $object->getDerniereValeurDate(), ]; return $data; } public function hydrate(array $data, $object) { $object->setValeur(DateTimeFromString::run($data['date']), $data['valeur']); $object->setCode($data['code']); $object->setLibelle($data['libelle']); } } Loading
module/Mission/config/module.config.php +4 −7 Changes for module/Mission/config/module.config.php: 4 added lines, 7 removed lines. Original line number Diff line number Diff line Loading @@ -9,8 +9,6 @@ use Mission\Controller\MissionTauxController; use Mission\Service\MissionTauxService; use Mission\Service\MissionTauxServiceFactory; use UnicaenAuth\Assertion\AssertionFactory; use Mission\Service\MissionTauxValeurService; use Mission\Service\MissionTauxValeurServiceFactory; use UnicaenAuth\Guard\PrivilegeController; Loading Loading @@ -71,22 +69,22 @@ return [ 'may_terminate' => true, 'child_routes' => [ 'saisir' => [ 'route' => '/saisir[/:tauxRemu]', 'route' => '/saisir[/:missionTauxRemu]', 'controller' => MissionTauxController::class, 'action' => 'saisir', ], 'supprimer' => [ 'route' => '/supprimer/:tauxRemu', 'route' => '/supprimer/:missionTauxRemu', 'controller' => MissionTauxController::class, 'action' => 'supprimer', ], 'saisir-valeur' => [ 'route' => '/saisir-valeur[/:tauxRemu][/:tauxRemuValeur]', 'route' => '/saisir-valeur[/:missionTauxRemu][/:missionTauxRemuValeur]', 'controller' => MissionTauxController::class, 'action' => 'saisirValeur', ], 'supprimer-valeur' => [ 'route' => '/supprimer-valeur/:tauxRemuValeur', 'route' => '/supprimer-valeur/:missionTauxRemuValeur', 'controller' => MissionTauxController::class, 'action' => 'supprimerValeur', ], Loading Loading @@ -188,7 +186,6 @@ return [ 'services' => [ MissionTauxService::class => MissionTauxServiceFactory::class, MissionTauxValeurService::class => MissionTauxValeurServiceFactory::class, Assertion\MissionAssertion::class => AssertionFactory::class, Service\MissionService::class => Service\MissionServiceFactory::class, ], Loading
module/Mission/src/Controller/MissionTauxController.php +21 −19 Changes for module/Mission/src/Controller/MissionTauxController.php: 21 added lines, 19 removed lines. Original line number Diff line number Diff line Loading @@ -6,7 +6,6 @@ use Application\Controller\AbstractController; use Mission\Form\MissionTauxFormAwareTrait; use Mission\Form\MissionTauxValeurFormAwareTrait; use Mission\Service\MissionTauxServiceAwareTrait; use Mission\Service\MissionTauxValeurServiceAwareTrait; use Application\Service\Traits\ContextServiceAwareTrait; use UnicaenApp\View\Model\MessengerViewModel; Loading @@ -18,7 +17,6 @@ use UnicaenApp\View\Model\MessengerViewModel; class MissionTauxController extends AbstractController { use MissionTauxServiceAwareTrait; use MissionTauxValeurServiceAwareTrait; use ContextServiceAwareTrait; use MissionTauxFormAwareTrait; use MissionTauxValeurFormAwareTrait; Loading @@ -37,8 +35,7 @@ class MissionTauxController extends AbstractController public function saisirAction() { $tauxRemuId = $this->params()->fromRoute('tauxRemu'); $tauxRemu = $this->getServiceMissionTaux()->get($tauxRemuId); $tauxRemu = $this->getEvent()->getParam('missionTauxRemu'); $form = $this->getFormMissionTaux(); if (empty($tauxRemu)) { $title = "Création d'un nouveau taux"; Loading @@ -48,7 +45,16 @@ class MissionTauxController extends AbstractController } $form->bindRequestSave($tauxRemu, $this->getRequest(), function () use ($tauxRemu, $form) { $this->getServiceMissionTaux()->save($tauxRemu); $this->em()->persist($tauxRemu); $tauxRemuValeurs = $tauxRemu->getTauxRemuValeurs(); foreach ($tauxRemuValeurs as $tauxRemuValeur) { $tauxRemuValeur->setMissionTauxRemu($tauxRemu); $this->em()->persist($tauxRemuValeur); } $this->em()->flush($tauxRemu); foreach ($tauxRemuValeurs as $tauxRemuValeur) { $this->em()->flush($tauxRemuValeur); } $this->flashMessenger()->addSuccessMessage( "Ajout réussi" ); Loading @@ -62,28 +68,25 @@ class MissionTauxController extends AbstractController public function saisirValeurAction(): array { $tauxRemuValeurId = $this->params()->fromRoute('tauxRemuValeur'); $tauxRemuValeur = $this->getServiceMissionTauxValeur()->get($tauxRemuValeurId); $tauxRemuValeur = $this->getEvent()->getParam('missionTauxRemuValeur'); $form = $this->getFormMissionTauxValeur(); if (empty($tauxRemuValeur)) { $title = "Création d'une nouvelle valeur"; /* @var \Mission\Entity\Db\MissionTauxRemuValeur $tauxRemuValeur */ $tauxRemuValeur = $this->getServiceMissionTauxValeur()->newEntity(); $tauxRemuValeur = $this->getServiceMissionTaux()->newEntityValeur(); } else { $title = "Édition d'une nouvelle valeur"; $title = "Édition d'une valeur"; } if ($tauxRemuValeur->getMissionTauxRemu() == null) { $tauxRemuId = $this->params()->fromRoute('tauxRemu'); $tauxRemu = $this->getServiceMissionTaux()->get($tauxRemuId); $tauxRemuValeur = $tauxRemuValeur->setMissionTauxRemu($tauxRemu); $tauxRemu = $this->getEvent()->getParam('missionTauxRemu'); $tauxRemuValeur->setMissionTauxRemu($tauxRemu); } $form->bindRequestSave($tauxRemuValeur, $this->getRequest(), function () use ($tauxRemuValeur, $form) { $this->getServiceMissionTauxValeur()->save($tauxRemuValeur); $this->em()->persist($tauxRemuValeur); $this->em()->flush($tauxRemuValeur); $this->flashMessenger()->addSuccessMessage( "Ajout réussi" ); Loading @@ -96,7 +99,7 @@ class MissionTauxController extends AbstractController public function supprimerAction(): MessengerViewModel { $tauxRemu = $this->getEvent()->getParam('tauxRemu'); $tauxRemu = $this->getEvent()->getParam('missionTauxRemu'); $this->getServiceMissionTaux()->delete($tauxRemu, true); return new MessengerViewModel(); Loading @@ -108,7 +111,6 @@ class MissionTauxController extends AbstractController { return new MessengerViewModel(); } }
module/Mission/src/Controller/MissionTauxControllerFactory.php −2 Changes for module/Mission/src/Controller/MissionTauxControllerFactory.php: 0 added lines, 2 removed lines. Original line number Diff line number Diff line Loading @@ -5,7 +5,6 @@ namespace Mission\Controller; use Application\Service\ContextService; use Mission\Form\MissionTauxForm; use Mission\Service\MissionTauxService; use Mission\Service\MissionTauxValeurService; use Psr\Container\ContainerInterface; /** Loading @@ -26,7 +25,6 @@ class MissionTauxControllerFactory { $controller = new MissionTauxController; $controller->setServiceMissionTaux($container->get(MissionTauxService::class)); $controller->setServiceMissionTauxValeur($container->get(MissionTauxValeurService::class)); $controller->setServiceContext($container->get(ContextService::class)); return $controller; } Loading
module/Mission/src/Entity/Db/MissionTauxRemu.php +37 Changes for module/Mission/src/Entity/Db/MissionTauxRemu.php: 37 added lines, 0 removed lines. Original line number Diff line number Diff line Loading @@ -2,6 +2,7 @@ namespace Mission\Entity\Db; use DateTime; use Doctrine\Common\Collections\ArrayCollection; use Doctrine\Common\Collections\Collection; use UnicaenApp\Entity\HistoriqueAwareInterface; Loading Loading @@ -131,4 +132,40 @@ class MissionTauxRemu implements HistoriqueAwareInterface { return $this->getLibelle(); } public function getDerniereValeur(){ $valeurRetour = null; $valeurRetourDate = null; $valeurs = $this->tauxRemuValeurs->getValues(); foreach ($valeurs as $valeur){ if($valeurRetourDate == null || $valeur->getDateEffet() > $valeurRetourDate){ $valeurRetour = $valeur->getValeur(); $valeurRetourDate = $valeur->getDateEffet(); } } return $valeurRetour; } public function getDerniereValeurDate(){ $valeurRetourDate = null; $valeurs = $this->tauxRemuValeurs->getValues(); foreach ($valeurs as $valeur){ if($valeurRetourDate == null || $valeur->getDateEffet() > $valeurRetourDate){ $valeurRetourDate = $valeur->getDateEffet(); } } return $valeurRetourDate; } public function setValeur(DateTime $date, float $valeur){ $tauxRemuValeurProche = $this->getTauxRemuValeur($date); if($tauxRemuValeurProche != null && $tauxRemuValeurProche->getDateEffet() == $date){ $tauxRemuValeurProche->setValeur($valeur); }else{ //new tauxremu $newTauxRemu = new MissionTauxRemuValeur(); $newTauxRemu->setValeur($valeur); $newTauxRemu->setDateEffet($date); $this->addTauxRemuValeur($newTauxRemu); } } }
module/Mission/src/Form/MissionTauxForm.php +48 −36 Changes for module/Mission/src/Form/MissionTauxForm.php: 48 added lines, 36 removed lines. Original line number Diff line number Diff line Loading @@ -2,9 +2,13 @@ namespace Mission\Form; use Application\Filter\DateTimeFromString; use Application\Form\AbstractForm; use Application\Hydrator\GenericHydrator; use DateTime; use Laminas\Form\FormInterface; use Mission\Entity\Db\MissionTauxRemu; use Mission\Entity\Db\MissionTauxRemuValeur; use UnicaenImport\Service\Traits\SchemaServiceAwareTrait; class MissionTauxForm extends AbstractForm Loading @@ -13,49 +17,57 @@ class MissionTauxForm extends AbstractForm public function init() { // $ignore = [""]; // $this->add([ // 'type' => 'Text', // 'name' => 'Libelle', // 'options' => [ // 'label' => 'Libelle', // ], // ]); // $this->add([ // 'type' => 'Text', // 'name' => 'Code', // 'options' => [ // 'label' => 'Code', // ], // ]); // $this->add([ // 'type' => 'Text', // 'name' => 'Valeur', // 'options' => [ // 'label' => 'Valeur', // ], // ]); $this->add([ // 'type' => 'DateTime', // 'name' => 'Date', // 'options' => [ // 'label' => 'Date', // ], // ]); $hydratorForm = new missionTauxRemuHydrator($this->getEntityManager()); $this->setHydrator($hydratorForm); $this->spec(MissionTauxRemu::class); $this->build(); $this->addSecurity(); $this->addSubmit(); $this->add([ 'name' => 'date', 'type' => 'Date', 'options' => [ 'label' => 'Date d\'effet', ], ]); $this->add([ 'name' => 'submit', 'type' => 'Submit', 'attributes' => [ 'value' => 'Enregistrer', 'class' => 'btn btn-primary btn-save', ], ]); return $this; } } public function bind($object, $flags = FormInterface::VALUES_NORMALIZED) class missionTauxRemuHydrator extends GenericHydrator { /* @var $object MissionTauxRemu */ parent::bind($object, $flags); return $this; public function extract($object): array { $data = [ 'id' => $object->getId(), 'code' => $object->getCode(), 'libelle' => $object->getLibelle(), 'valeur' => $object->getDerniereValeur(), 'date' => $object->getDerniereValeurDate(), ]; return $data; } public function hydrate(array $data, $object) { $object->setValeur(DateTimeFromString::run($data['date']), $data['valeur']); $object->setCode($data['code']); $object->setLibelle($data['libelle']); } }