reste frais et presences (4ae0000a) · Commits · open-source / emc2

module/Formation/config/merged/formation-instance-document.config.php

+2 −25

Changes for module/Formation/config/merged/formation-instance-document.config.php: 2 added lines, 25 removed lines.
Original line number	Diff line number	Diff line
		@@ -16,7 +16,6 @@ return [
		'controller' => FormationInstanceDocumentController::class,
		'action' => [
		'generer-convocation',
		'generer-convocation-stagiaire-externe',
		],
		'privileges' => [
		FormationinstancedocumentPrivileges::FORMATIONINSTANCEDOCUMENT_CONVOCATION
		@@ -26,7 +25,6 @@ return [
		'controller' => FormationInstanceDocumentController::class,
		'action' => [
		'generer-attestation',
		'generer-attestation-stagiaire-externe',
		],
		'privileges' => [
		FormationinstancedocumentPrivileges::FORMATIONINSTANCEDOCUMENT_ATTESTATION
		@@ -62,27 +60,17 @@ return [
		'generer-convocation' => [
		'type' => Segment::class,
		'options' => [
		'route' => '/generer-convocation/:inscrit',
		'route' => '/generer-convocation/:inscription',
		'defaults' => [
		'controller' => FormationInstanceDocumentController::class,
		'action' => 'generer-convocation',
		],
		],
		],
		'generer-convocation-stagiaire-externe' => [
		'type' => Segment::class,
		'options' => [
		'route' => '/generer-convocation-stagiaire-externe/:inscription-externe',
		'defaults' => [
		'controller' => FormationInstanceDocumentController::class,
		'action' => 'generer-convocation-stagiaire-externe',
		],
		],
		],
		'generer-attestation' => [
		'type' => Segment::class,
		'options' => [
		'route' => '/generer-attestation/:inscrit',
		'route' => '/generer-attestation/:inscription',
		'defaults' => [
		/** @see FormationInstanceDocumentController::genererAttestationAction() */
		'controller' => FormationInstanceDocumentController::class,
		@@ -90,17 +78,6 @@ return [
		],
		],
		],
		'generer-attestation-stagiaire-externe' => [
		'type' => Segment::class,
		'options' => [
		'route' => '/generer-attestation-stagiaire-externe/:inscription-externe',
		'defaults' => [
		/** @see FormationInstanceDocumentController::genererAttestationStagiaireExterneAction() */
		'controller' => FormationInstanceDocumentController::class,
		'action' => 'generer-attestation-stagiaire-externe',
		],
		],
		],
		'generer-historique' => [
		'type' => Segment::class,
		'options' => [

module/Formation/config/merged/formation-instance-inscrit.config.php

+0 −156

Changes for module/Formation/config/merged/formation-instance-inscrit.config.php: 0 added lines, 156 removed lines.
Original line number	Diff line number	Diff line
		@@ -10,8 +10,6 @@ use Formation\Provider\Privilege\FormationinstanceinscritPrivileges;
		use Formation\Provider\Privilege\FormationinstancePrivileges;
		use Formation\Service\FormationInstanceInscrit\FormationInstanceInscritService;
		use Formation\Service\FormationInstanceInscrit\FormationInstanceInscritServiceFactory;
		use Formation\Service\InscriptionExterne\InscriptionExterneService;
		use Formation\Service\InscriptionExterne\InscriptionExterneServiceFactory;
		use Laminas\Router\Http\Literal;
		use Laminas\Router\Http\Segment;
		use UnicaenPrivilege\Guard\PrivilegeController;
		@@ -23,18 +21,6 @@ return [
		[
		'controller' => FormationInstanceInscritController::class,
		'action' => [
		'afficher-agent',
		'ajouter-agent',
		'historiser-agent',
		'restaurer-agent',
		'supprimer-agent',
		'ajouter-stagiaire-externe',
		'historiser-stagiaire-externe',
		'restaurer-stagiaire-externe',
		'supprimer-stagiaire-externe',
		'envoyer-liste-principale',
		'envoyer-liste-complementaire',
		'classer-inscription',
		],
		'privileges' => [
		FormationinstancePrivileges::FORMATIONINSTANCE_GERER_INSCRIPTION,
		@@ -243,147 +229,6 @@ return [
		],
		],
		],
		'valider-drh' => [
		'type' => Segment::class,
		'options' => [
		'route' => '/valider-drh/:inscrit',
		'defaults' => [
		'controller' => FormationInstanceInscritController::class,
		'action' => 'valider-drh',
		],
		],
		],
		'refuser-drh' => [
		'type' => Segment::class,
		'options' => [
		'route' => '/refuser-drh/:inscrit',
		'defaults' => [
		'controller' => FormationInstanceInscritController::class,
		'action' => 'refuser-drh',
		],
		],
		],
		'ajouter-agent' => [
		'type' => Segment::class,
		'options' => [
		'route' => '/ajouter-agent/:formation-instance',
		'defaults' => [
		'controller' => FormationInstanceInscritController::class,
		'action' => 'ajouter-agent',
		],
		],
		],
		'afficher-agent' => [
		'type' => Segment::class,
		'options' => [
		'route' => '/afficher-agent/:inscrit',
		'defaults' => [
		'controller' => FormationInstanceInscritController::class,
		'action' => 'afficher-agent',
		],
		],
		],
		'historiser-agent' => [
		'type' => Segment::class,
		'options' => [
		'route' => '/historiser-agent/:inscrit',
		'defaults' => [
		'controller' => FormationInstanceInscritController::class,
		'action' => 'historiser-agent',
		],
		],
		],
		'restaurer-agent' => [
		'type' => Segment::class,
		'options' => [
		'route' => '/restaurer-agent/:inscrit',
		'defaults' => [
		'controller' => FormationInstanceInscritController::class,
		'action' => 'restaurer-agent',
		],
		],
		],
		'supprimer-agent' => [
		'type' => Segment::class,
		'options' => [
		'route' => '/supprimer-agent/:inscrit',
		'defaults' => [
		'controller' => FormationInstanceInscritController::class,
		'action' => 'supprimer-agent',
		],
		],
		],
		'ajouter-stagiaire-externe' => [
		'type' => Segment::class,
		'options' => [
		'route' => '/ajouter-stagiaire-externe/:session',
		'defaults' => [
		/** @see FormationInstanceInscritController::ajouterStagiaireExterneAction() */
		'controller' => FormationInstanceInscritController::class,
		'action' => 'ajouter-stagiaire-externe',
		],
		],
		],
		'historiser-stagiaire-externe' => [
		'type' => Segment::class,
		'options' => [
		'route' => '/historiser-stagiaire-externe/:inscription-externe',
		'defaults' => [
		'controller' => FormationInstanceInscritController::class,
		'action' => 'historiser-stagiaire-externe',
		],
		],
		],
		'restaurer-stagiaire-externe' => [
		'type' => Segment::class,
		'options' => [
		'route' => '/restaurer-stagiaire-externe/:inscription-externe',
		'defaults' => [
		'controller' => FormationInstanceInscritController::class,
		'action' => 'restaurer-stagiaire-externe',
		],
		],
		],
		'supprimer-stagiaire-externe' => [
		'type' => Segment::class,
		'options' => [
		'route' => '/supprimer-stagiaire-externe/:inscription-externe',
		'defaults' => [
		'controller' => FormationInstanceInscritController::class,
		'action' => 'supprimer-stagiaire-externe',
		],
		],
		],
		'envoyer-liste-principale' => [
		'type' => Segment::class,
		'options' => [
		'route' => '/envoyer-liste-principale/:inscrit',
		'defaults' => [
		'controller' => FormationInstanceInscritController::class,
		'action' => 'envoyer-liste-principale',
		],
		],
		],
		'envoyer-liste-complementaire' => [
		'type' => Segment::class,
		'options' => [
		'route' => '/envoyer-liste-complementaire/:inscrit',
		'defaults' => [
		'controller' => FormationInstanceInscritController::class,
		'action' => 'envoyer-liste-complementaire',
		],
		],
		],
		'classer-inscription' => [
		'type' => Segment::class,
		'options' => [
		'route' => '/classer-inscription/:inscrit',
		'defaults' => [
		'controller' => FormationInstanceInscritController::class,
		'action' => 'classer-inscription',
		],
		],
		],
		],
		],
		],
		@@ -392,7 +237,6 @@ return [
		'service_manager' => [
		'factories' => [
		FormationInstanceInscritService::class => FormationInstanceInscritServiceFactory::class,
		InscriptionExterneService::class => InscriptionExterneServiceFactory::class,
		],
		],
		'controllers' => [

module/Formation/config/merged/inscription.config.php

+107 −0

Changes for module/Formation/config/merged/inscription.config.php: 107 added lines, 0 removed lines.
Original line number	Diff line number	Diff line
		@@ -12,6 +12,7 @@ use Formation\Form\Justificatif\JustificatifForm;
		use Formation\Form\Justificatif\JustificatifFormFactory;
		use Formation\Form\Justificatif\JustificatifHydrator;
		use Formation\Form\Justificatif\JustificatifHydratorFactory;
		use Formation\Provider\Privilege\FormationinstanceinscritPrivileges;
		use Formation\Provider\Privilege\FormationinstancePrivileges;
		use Formation\Service\Inscription\InscriptionService;
		use Formation\Service\Inscription\InscriptionServiceFactory;
		@@ -46,6 +47,30 @@ return [
		FormationinstancePrivileges::FORMATIONINSTANCE_GERER_INSCRIPTION,
		],
		],
		[
		'controller' => InscriptionController::class,
		'action' => [
		'valider-responsable',
		'refuser-responsable',
		],
		'privileges' => [
		FormationinstanceinscritPrivileges::INSCRIPTION_VALIDER_SUPERIEURE,
		],
		],
		[
		'controller' => InscriptionController::class,
		'action' => [
		'valider-drh',
		'refuser-drh',
		'classer',
		'envoyer-liste-principale',
		'envoyer-liste-complementaire',
		'retirer-liste',
		],
		'privileges' => [
		FormationinstanceinscritPrivileges::INSCRIPTION_VALIDER_GESTIONNAIRE,
		],
		],
		],
		],
		],
		@@ -126,6 +151,88 @@ return [
		],
		],
		],
		/ Validation **************************************************************************/
		'valider-responsable' => [
		'type' => Segment::class,
		'options' => [
		'route' => '/valider-responsable/:inscription',
		'defaults' => [
		/** @see InscriptionController::validerResponsableAction() */
		'action' => 'valider-responsable',
		],
		],
		],
		'refuser-responsable' => [
		'type' => Segment::class,
		'options' => [
		'route' => '/refuser-responsable/:inscription',
		'defaults' => [
		/** @see InscriptionController::refuserResponsablehAction() */
		'action' => 'refuser-responsable',
		],
		],
		],
		'valider-drh' => [
		'type' => Segment::class,
		'options' => [
		'route' => '/valider-drh/:inscription',
		'defaults' => [
		/** @see InscriptionController::validerDrhAction() */
		'action' => 'valider-drh',
		],
		],
		],
		'refuser-drh' => [
		'type' => Segment::class,
		'options' => [
		'route' => '/refuser-drh/:inscription',
		'defaults' => [
		/** @see InscriptionController::refuserDrhAction() */
		'action' => 'refuser-drh',
		],
		],
		],
		/ Classement **************************************************************************/
		'envoyer-liste-principale' => [
		'type' => Segment::class,
		'options' => [
		'route' => '/envoyer-liste-principale/:inscription',
		'defaults' => [
		/** @see InscriptionController::envoyerListePrincipaleAction() */
		'action' => 'envoyer-liste-principale',
		],
		],
		],
		'envoyer-liste-complementaire' => [
		'type' => Segment::class,
		'options' => [
		'route' => '/envoyer-liste-complementaire/:inscription',
		'defaults' => [
		/** @see InscriptionController::envoyerListeComplementaireAction() */
		'action' => 'envoyer-liste-complementaire',
		],
		],
		],
		'retirer-liste' => [
		'type' => Segment::class,
		'options' => [
		'route' => '/retirer-liste/:inscription',
		'defaults' => [
		/** @see InscriptionController::retirerListeAction() */
		'action' => 'retirer-liste',
		],
		],
		],
		'classer' => [
		'type' => Segment::class,
		'options' => [
		'route' => '/classer/:inscription',
		'defaults' => [
		/** @see InscriptionController::classerAction() */
		'action' => 'classer',
		],
		],
		],
		],
		],
		],

module/Formation/src/Formation/Controller/FormationInstanceDocumentController.php

+11 −60

Changes for module/Formation/src/Formation/Controller/FormationInstanceDocumentController.php: 11 added lines, 60 removed lines.
Original line number	Diff line number	Diff line
		@@ -12,8 +12,7 @@ use Formation\Provider\Etat\SessionEtats;
		use Formation\Provider\Template\PdfTemplates;
		use Formation\Service\Emargement\EmargementPdfExporter;
		use Formation\Service\FormationInstance\FormationInstanceServiceAwareTrait;
		use Formation\Service\FormationInstanceInscrit\FormationInstanceInscritServiceAwareTrait;
		use Formation\Service\InscriptionExterne\InscriptionExterneServiceAwareTrait;
		use Formation\Service\Inscription\InscriptionServiceAwareTrait;
		use Formation\Service\Seance\SeanceServiceAwareTrait;
		use Formation\Service\Url\UrlServiceAwareTrait;
		use JetBrains\PhpStorm\NoReturn;
		@@ -28,8 +27,7 @@ class FormationInstanceDocumentController extends AbstractActionController
		{
		use AgentServiceAwareTrait;
		use FormationInstanceServiceAwareTrait;
		use FormationInstanceInscritServiceAwareTrait;
		use InscriptionExterneServiceAwareTrait;
		use InscriptionServiceAwareTrait;
		use MacroServiceAwareTrait;
		use RenduServiceAwareTrait;
		use SeanceServiceAwareTrait;
		@@ -83,34 +81,10 @@ class FormationInstanceDocumentController extends AbstractActionController
		*/
		public function genererConvocationAction(): ?string
		{
		$inscrit = $this->getFormationInstanceInscritService()->getRequestedFormationInstanceInscrit($this);
		$inscription = $this->getInscriptionService()->getRequestedInscription($this);

		$vars = [
		'agent' => $inscrit->getAgent(),
		'formation' => $inscrit->getInstance()->getFormation(),
		'session' => $inscrit->getInstance(),
		'MacroService' => $this->getMacroService(),
		'UrlService' => $this->getUrlService(),
		];
		$rendu = $this->getRenduService()->generateRenduByTemplateCode(PdfTemplates::FORMATION_CONVOCATION, $vars);
		$exporter = new PdfExporter();
		$exporter->setRenderer($this->renderer);
		$exporter->getMpdf()->SetTitle($rendu->getSujet());
		$exporter->setHeaderScript('/application/document/pdf/entete-logo-ccc');
		$exporter->setFooterScript('/application/document/pdf/pied-vide');
		$exporter->addBodyHtml($rendu->getCorps());
		return $exporter->export($rendu->getSujet(), PdfExporter::DESTINATION_BROWSER, null);
		}

		/**
		* @throws MpdfException
		*/
		public function genererConvocationStagiaireExterneAction() : ?string
		{
		$inscription = $this->getInscriptionExterneService()->getRequestedInscriptionExterne($this);

		$vars = [
		'agent' => $inscription->getStagiaire(),
		'agent' => $inscription->getIndividu(),
		'formation' => $inscription->getSession()->getFormation(),
		'session' => $inscription->getSession(),
		'MacroService' => $this->getMacroService(),
		@@ -131,37 +105,11 @@ class FormationInstanceDocumentController extends AbstractActionController
		*/
		public function genererAttestationAction(): ?string
		{
		$inscrit = $this->getFormationInstanceInscritService()->getRequestedFormationInstanceInscrit($this);
		$inscription = $this->getInscriptionService()->getRequestedInscription($this);

		$vars = [
		'type' => '',
		'agent' => $inscrit->getAgent(),
		'inscription' => $inscrit,
		'formation' => $inscrit->getInstance()->getFormation(),
		'session' => $inscrit->getInstance(),
		'MacroService' => $this->getMacroService(),
		'UrlService' => $this->getUrlService(),
		];
		$rendu = $this->getRenduService()->generateRenduByTemplateCode(PdfTemplates::FORMATION_ATTESTATION, $vars);
		$exporter = new PdfExporter();
		$exporter->setRenderer($this->renderer);
		$exporter->getMpdf()->SetTitle($rendu->getSujet());
		$exporter->setHeaderScript('/application/document/pdf/entete-logo-ccc');
		$exporter->setFooterScript('/application/document/pdf/pied-vide');
		$exporter->addBodyHtml($rendu->getCorps());
		return $exporter->export($rendu->getSujet(), PdfExporter::DESTINATION_BROWSER, null);
		}

		/**
		* @throws MpdfException
		*/
		public function genererAttestationStagiaireExterneAction() : ?string
		{
		$inscription = $this->getInscriptionExterneService()->getRequestedInscriptionExterne($this);

		$vars = [
		'type' => '',
		'agent' => $inscription->getStagiaire(),
		'agent' => $inscription->getAgent(),
		'inscription' => $inscription,
		'formation' => $inscription->getSession()->getFormation(),
		'session' => $inscription->getSession(),
		@@ -178,13 +126,14 @@ class FormationInstanceDocumentController extends AbstractActionController
		return $exporter->export($rendu->getSujet(), PdfExporter::DESTINATION_BROWSER, null);
		}


		/**
		* @throws MpdfException
		*/
		public function genererHistoriqueAction(): ?string
		{
		$agent = $this->getAgentService()->getRequestedAgent($this);
		$inscriptions = $this->getFormationInstanceInscritService()->getFormationsBySuivies($agent);
		$inscriptions = $this->getInscriptionService()->getFormationsBySuivies($agent);


		$array = [];
		@@ -197,7 +146,9 @@ class FormationInstanceDocumentController extends AbstractActionController

		$texte = "";
		foreach ($array as $annee => $inscriptions) {
		usort($inscriptions, function (FormationInstanceInscrit $a, FormationInstanceInscrit $b) { return $a->getInstance()->getDebut(true) > $b->getInstance()->getDebut(true);});
		usort($inscriptions, function (FormationInstanceInscrit $a, FormationInstanceInscrit $b) {
		return $a->getInstance()->getDebut(true) > $b->getInstance()->getDebut(true);
		});
		$texte .= "<div>";
		$texte .= "<h3>Formations pour l'année " . $annee . "/" . ($annee + 1) . "</h3>";
		$texte .= "<ul>";

module/Formation/src/Formation/Controller/FormationInstanceDocumentControllerFactory.php

+4 −8

File changed.

Preview size limit exceeded, changes collapsed.