Loading module/Formation/src/Formation/Controller/FormationController.php +1 −4 Original line number Diff line number Diff line Loading @@ -2,11 +2,9 @@ namespace Formation\Controller; use Application\Form\ModifierLibelle\ModifierLibelleFormAwareTrait; use Application\Service\ParcoursDeFormation\ParcoursDeFormationServiceAwareTrait; use Formation\Entity\Db\Formation; use Formation\Form\Formation\FormationFormAwareTrait; use Formation\Form\FormationGroupe\FormationGroupeFormAwareTrait; use Formation\Service\Formation\FormationServiceAwareTrait; use Formation\Service\FormationGroupe\FormationGroupeServiceAwareTrait; use Formation\Service\FormationTheme\FormationThemeServiceAwareTrait; Loading @@ -22,14 +20,13 @@ class FormationController extends AbstractActionController use ParcoursDeFormationServiceAwareTrait; use FormationFormAwareTrait; use FormationGroupeFormAwareTrait; use ModifierLibelleFormAwareTrait; public function indexAction() { $formations = $this->getFormationService()->getFormations('libelle'); $groupes = $this->getFormationGroupeService()->getFormationsGroupes(); $themes = $this->getFormationThemeService()->getFormationsThemes(); return new ViewModel([ 'formations' => $formations, 'groupes' => $groupes, Loading module/Formation/src/Formation/Controller/FormationControllerFactory.php +0 −8 Original line number Diff line number Diff line Loading @@ -2,9 +2,7 @@ namespace Formation\Controller; use Application\Form\ModifierLibelle\ModifierLibelleForm; use Formation\Form\Formation\FormationForm; use Formation\Form\FormationGroupe\FormationGroupeForm; use Formation\Service\Formation\FormationService; use Formation\Service\FormationGroupe\FormationGroupeService; use Formation\Service\FormationTheme\FormationThemeService; Loading @@ -26,12 +24,8 @@ class FormationControllerFactory /** * @var FormationForm $formationForm * @var FormationGroupeForm $formationGroupeForm * @var ModifierLibelleForm $modifierLibelleForm */ $formationForm = $container->get('FormElementManager')->get(FormationForm::class); $formationGroupeForm = $container->get('FormElementManager')->get(FormationGroupeForm::class); $modifierLibelleForm = $container->get('FormElementManager')->get(ModifierLibelleForm::class); /** @var FormationController $controller */ $controller = new FormationController(); Loading @@ -39,8 +33,6 @@ class FormationControllerFactory $controller->setFormationGroupeService($formationGroupeService); $controller->setFormationThemeService($formationThemeService); $controller->setFormationForm($formationForm); $controller->setFormationGroupeForm($formationGroupeForm); $controller->setModifierLibelleForm($modifierLibelleForm); return $controller; } Loading module/Formation/view/formation/formation-groupe/afficher-groupe.phtml +0 −1 Original line number Diff line number Diff line Loading @@ -7,7 +7,6 @@ * @var FormationGroupe $groupe */ use Application\Controller\FormationController; use Formation\Entity\Db\FormationGroupe; ?> Loading module/Formation/view/formation/formation-instance-presence/renseigner-presences.phtml +6 −4 Original line number Diff line number Diff line Loading @@ -33,13 +33,15 @@ $this->headTitle("Présences pour la formation : " . $instance->getInstanceCode( <h2> Instance de la formation </h2> </div> <div class="pull-right"> <a href="<?php echo $this->url('formation-instance/afficher', ['formation-instance' => $instance->getId()], [], true); ?>" <a <?php /** @see FormationInstanceController::afficherAction() */?> href="<?php echo $this->url('formation-instance/afficher', ['formation-instance' => $instance->getId()], [], true); ?>" class="btn btn-info action"> <span class="icon retour"></span> Retour à l'instance de la formation </a> <br/> <a href="<?php echo $this->url('formation/editer', ['formation' => $instance->getFormation()->getId()], [], true); ?>" <a <?php /** @see FormationController::editerAction() */?> href="<?php echo $this->url('formation/editer', ['formation' => $instance->getFormation()->getId()], [], true); ?>" class="btn btn-info action"> <span class="icon retour-double"></span> Retour à la formation associée Loading Loading @@ -155,7 +157,7 @@ $this->headTitle("Présences pour la formation : " . $instance->getInstanceCode( // console.log('inscrit: ' + inscrit); // console.log('journee: ' + journee); <?php /** @see \Formation\Controller\FormationInstancePresenceController::togglePresenceAction() */ ?> <?php /** @see FormationInstancePresenceController::togglePresenceAction() */ ?> let url = "../toggle-presence/" + journee + "/" + inscrit; $.ajax({ type: "POST", Loading Loading @@ -183,7 +185,7 @@ $this->headTitle("Présences pour la formation : " . $instance->getInstanceCode( console.log('mode: ' + mode); console.log('inscrit: ' + inscrit); <?php /** @see \Formation\Controller\FormationInstancePresenceController::togglePresencesAction() */ ?> <?php /** @see FormationInstancePresenceController::togglePresencesAction() */ ?> let url = "../toggle-presences/" + mode + "/" + inscrit; $.ajax({ type: "POST", Loading module/Formation/view/formation/formation-instance/afficher.phtml +7 −4 Original line number Diff line number Diff line Loading @@ -13,6 +13,7 @@ use Formation\Provider\Privilege\FormationinstancejourneePrivileges; use Formation\Provider\Privilege\FormationinstancepresencePrivileges; /** * @see FormationInstanceController::afficherAction() * @var FormationInstance $instance */ Loading Loading @@ -55,13 +56,15 @@ $canPresenceModifier = $this->isAllowed(FormationinstancepresencePrivileges:: <h2> Formation </h2> </div> <div class="pull-right"> <a href="<?php echo $this->url('formation/editer', ['formation' => $instance->getFormation()->getId()], [], true); ?>" <a <?php /** @see FormationController::editerAction() */ ?> href="<?php echo $this->url('formation/editer', ['formation' => $instance->getFormation()->getId()], [], true); ?>" class="btn btn-info action"> <span class="icon retour"></span> Retour à la formation associée </a> <br/> <a href="<?php echo $this->url('formation', [], [], true); ?>" <a <?php /** @see FormationController::indexAction() */ ?> href="<?php echo $this->url('formation', [], [], true); ?>" class="btn btn-info action"> <span class="icon retour-double"></span> Retour à l'index des formations Loading Loading @@ -187,14 +190,14 @@ $canPresenceModifier = $this->isAllowed(FormationinstancepresencePrivileges:: </div> <div class="pull-right"> <?php if ($canJourneeModifier): ?> <?php /** @see \Formation\Controller\FormationInstanceJourneeController::ajouterJourneeAction() */?> <?php /** @see FormationInstanceJourneeController::ajouterJourneeAction() */?> <a href="<?php echo $this->url('formation-instance/ajouter-journee', ['formation-instance' => $instance->getId()], [], true); ?>" class="btn btn-primary action ajax-modal" data-event="modification"> <span class="icon ajouter"></span> Ajouter une journée de formation </a> <br/> <?php /** @see \Formation\Controller\FormationInstanceDocumentController::exportTousEmargementsAction() */?> <?php /** @see FormationInstanceDocumentController::exportTousEmargementsAction() */?> <a href="<?php echo $this->url('formation-instance/export-tous-emargements', ['formation-instance' => $instance->getId()], [], true); ?>" class="btn btn-primary action" target="_blank"> <span class="icon pdf"></span> Loading Loading
module/Formation/src/Formation/Controller/FormationController.php +1 −4 Original line number Diff line number Diff line Loading @@ -2,11 +2,9 @@ namespace Formation\Controller; use Application\Form\ModifierLibelle\ModifierLibelleFormAwareTrait; use Application\Service\ParcoursDeFormation\ParcoursDeFormationServiceAwareTrait; use Formation\Entity\Db\Formation; use Formation\Form\Formation\FormationFormAwareTrait; use Formation\Form\FormationGroupe\FormationGroupeFormAwareTrait; use Formation\Service\Formation\FormationServiceAwareTrait; use Formation\Service\FormationGroupe\FormationGroupeServiceAwareTrait; use Formation\Service\FormationTheme\FormationThemeServiceAwareTrait; Loading @@ -22,14 +20,13 @@ class FormationController extends AbstractActionController use ParcoursDeFormationServiceAwareTrait; use FormationFormAwareTrait; use FormationGroupeFormAwareTrait; use ModifierLibelleFormAwareTrait; public function indexAction() { $formations = $this->getFormationService()->getFormations('libelle'); $groupes = $this->getFormationGroupeService()->getFormationsGroupes(); $themes = $this->getFormationThemeService()->getFormationsThemes(); return new ViewModel([ 'formations' => $formations, 'groupes' => $groupes, Loading
module/Formation/src/Formation/Controller/FormationControllerFactory.php +0 −8 Original line number Diff line number Diff line Loading @@ -2,9 +2,7 @@ namespace Formation\Controller; use Application\Form\ModifierLibelle\ModifierLibelleForm; use Formation\Form\Formation\FormationForm; use Formation\Form\FormationGroupe\FormationGroupeForm; use Formation\Service\Formation\FormationService; use Formation\Service\FormationGroupe\FormationGroupeService; use Formation\Service\FormationTheme\FormationThemeService; Loading @@ -26,12 +24,8 @@ class FormationControllerFactory /** * @var FormationForm $formationForm * @var FormationGroupeForm $formationGroupeForm * @var ModifierLibelleForm $modifierLibelleForm */ $formationForm = $container->get('FormElementManager')->get(FormationForm::class); $formationGroupeForm = $container->get('FormElementManager')->get(FormationGroupeForm::class); $modifierLibelleForm = $container->get('FormElementManager')->get(ModifierLibelleForm::class); /** @var FormationController $controller */ $controller = new FormationController(); Loading @@ -39,8 +33,6 @@ class FormationControllerFactory $controller->setFormationGroupeService($formationGroupeService); $controller->setFormationThemeService($formationThemeService); $controller->setFormationForm($formationForm); $controller->setFormationGroupeForm($formationGroupeForm); $controller->setModifierLibelleForm($modifierLibelleForm); return $controller; } Loading
module/Formation/view/formation/formation-groupe/afficher-groupe.phtml +0 −1 Original line number Diff line number Diff line Loading @@ -7,7 +7,6 @@ * @var FormationGroupe $groupe */ use Application\Controller\FormationController; use Formation\Entity\Db\FormationGroupe; ?> Loading
module/Formation/view/formation/formation-instance-presence/renseigner-presences.phtml +6 −4 Original line number Diff line number Diff line Loading @@ -33,13 +33,15 @@ $this->headTitle("Présences pour la formation : " . $instance->getInstanceCode( <h2> Instance de la formation </h2> </div> <div class="pull-right"> <a href="<?php echo $this->url('formation-instance/afficher', ['formation-instance' => $instance->getId()], [], true); ?>" <a <?php /** @see FormationInstanceController::afficherAction() */?> href="<?php echo $this->url('formation-instance/afficher', ['formation-instance' => $instance->getId()], [], true); ?>" class="btn btn-info action"> <span class="icon retour"></span> Retour à l'instance de la formation </a> <br/> <a href="<?php echo $this->url('formation/editer', ['formation' => $instance->getFormation()->getId()], [], true); ?>" <a <?php /** @see FormationController::editerAction() */?> href="<?php echo $this->url('formation/editer', ['formation' => $instance->getFormation()->getId()], [], true); ?>" class="btn btn-info action"> <span class="icon retour-double"></span> Retour à la formation associée Loading Loading @@ -155,7 +157,7 @@ $this->headTitle("Présences pour la formation : " . $instance->getInstanceCode( // console.log('inscrit: ' + inscrit); // console.log('journee: ' + journee); <?php /** @see \Formation\Controller\FormationInstancePresenceController::togglePresenceAction() */ ?> <?php /** @see FormationInstancePresenceController::togglePresenceAction() */ ?> let url = "../toggle-presence/" + journee + "/" + inscrit; $.ajax({ type: "POST", Loading Loading @@ -183,7 +185,7 @@ $this->headTitle("Présences pour la formation : " . $instance->getInstanceCode( console.log('mode: ' + mode); console.log('inscrit: ' + inscrit); <?php /** @see \Formation\Controller\FormationInstancePresenceController::togglePresencesAction() */ ?> <?php /** @see FormationInstancePresenceController::togglePresencesAction() */ ?> let url = "../toggle-presences/" + mode + "/" + inscrit; $.ajax({ type: "POST", Loading
module/Formation/view/formation/formation-instance/afficher.phtml +7 −4 Original line number Diff line number Diff line Loading @@ -13,6 +13,7 @@ use Formation\Provider\Privilege\FormationinstancejourneePrivileges; use Formation\Provider\Privilege\FormationinstancepresencePrivileges; /** * @see FormationInstanceController::afficherAction() * @var FormationInstance $instance */ Loading Loading @@ -55,13 +56,15 @@ $canPresenceModifier = $this->isAllowed(FormationinstancepresencePrivileges:: <h2> Formation </h2> </div> <div class="pull-right"> <a href="<?php echo $this->url('formation/editer', ['formation' => $instance->getFormation()->getId()], [], true); ?>" <a <?php /** @see FormationController::editerAction() */ ?> href="<?php echo $this->url('formation/editer', ['formation' => $instance->getFormation()->getId()], [], true); ?>" class="btn btn-info action"> <span class="icon retour"></span> Retour à la formation associée </a> <br/> <a href="<?php echo $this->url('formation', [], [], true); ?>" <a <?php /** @see FormationController::indexAction() */ ?> href="<?php echo $this->url('formation', [], [], true); ?>" class="btn btn-info action"> <span class="icon retour-double"></span> Retour à l'index des formations Loading Loading @@ -187,14 +190,14 @@ $canPresenceModifier = $this->isAllowed(FormationinstancepresencePrivileges:: </div> <div class="pull-right"> <?php if ($canJourneeModifier): ?> <?php /** @see \Formation\Controller\FormationInstanceJourneeController::ajouterJourneeAction() */?> <?php /** @see FormationInstanceJourneeController::ajouterJourneeAction() */?> <a href="<?php echo $this->url('formation-instance/ajouter-journee', ['formation-instance' => $instance->getId()], [], true); ?>" class="btn btn-primary action ajax-modal" data-event="modification"> <span class="icon ajouter"></span> Ajouter une journée de formation </a> <br/> <?php /** @see \Formation\Controller\FormationInstanceDocumentController::exportTousEmargementsAction() */?> <?php /** @see FormationInstanceDocumentController::exportTousEmargementsAction() */?> <a href="<?php echo $this->url('formation-instance/export-tous-emargements', ['formation-instance' => $instance->getId()], [], true); ?>" class="btn btn-primary action" target="_blank"> <span class="icon pdf"></span> Loading