Fin de la récupération du mail de contact (592d7a5e) · Commits · open-source / sygal

module/Application/config/others/doctorant.config.php

+2 −5

Changes for module/Application/config/others/doctorant.config.php: 2 added lines, 5 removed lines.
Original line number	Diff line number	Diff line
		@@ -53,13 +53,10 @@ return [
		'modifier-persopass' => [
		'type' => 'Segment',
		'options' => [
		'route' => '/modifier-persopass[/:detournement]',
		'constraints' => [
		'detournement' => '\d',
		],
		'route' => '/modifier-persopass[/:back]',
		'defaults' => [
		'action' => 'modifier-persopass',
		'detournement' => 0
		'back' => 0
		],
		],
		],

module/Application/src/Application/Controller/DoctorantController.php

+18 −5

Changes for module/Application/src/Application/Controller/DoctorantController.php: 18 added lines, 5 removed lines.
Original line number	Diff line number	Diff line
		@@ -35,7 +35,9 @@ class DoctorantController extends AbstractController
		$doctorant = $this->requestDoctorant();
		$mailConfirmation = $this->mailConfirmationService->getDemandeConfirmeeByIndividu($doctorant->getIndividu());
		if ($mailConfirmation !== null) {
		$viewmodel = new ViewModel();
		$viewmodel = new ViewModel([
		'email' => $mailConfirmation->getEmail(),
		]);
		$viewmodel->setTemplate('application/doctorant/demande-ok');
		return $viewmodel;
		}
		@@ -44,16 +46,26 @@ class DoctorantController extends AbstractController
		$mailConfirmation = $this->mailConfirmationService->getDemandeEnCoursByIndividu($doctorant->getIndividu());

		//Si on a déjà une demande en attente
		if ($mailConfirmation !== null) {
		$viewmodel = new ViewModel();
		$back = $this->params()->fromRoute('back');

		// var_dump($mailConfirmation->getIndividu()->__toString());
		// var_dump($mailConfirmation->getEmail());
		// var_dump($mailConfirmation->getCode());
		// var_dump($mailConfirmation->getEtat());
		// var_dump($back);
		if ($mailConfirmation !== null && ($back == 0 \|\| $back === null)) {
		$viewmodel = new ViewModel([
		'email' => $mailConfirmation->getEmail(),
		]);
		$viewmodel->setTemplate('application/doctorant/demande-encours');
		return $viewmodel;
		}

		if ($mailConfirmation === null) {
		$mailConfirmation = new MailConfirmation();
		$mailConfirmation->setIndividu($doctorant->getIndividu());
		$mailConfirmation->setEtat(MailConfirmation::ENVOYER);

		}
		$request = $this->getRequest();
		if ($request->isPost()) {

		@@ -63,7 +75,8 @@ class DoctorantController extends AbstractController
		$mailConfirmation->setEmail($email);
		$id = $this->mailConfirmationService->save($mailConfirmation);
		$this->mailConfirmationService->generateCode($id);
		$this->redirect()->toRoute('mail-confirmation-envoie', ['id' => $id], [], true);
		return $this->redirect()->toRoute('mail-confirmation-envoie', ['id' => $id], [], true);
		var_dump("here");
		} else {
		$this->flashMessenger()->addErrorMessage("L'email fourni <strong>".$email."</strong> est non valide.");
		}

module/Application/src/Application/Controller/Factory/DoctorantControllerFactory.php

+1 −0

Changes for module/Application/src/Application/Controller/Factory/DoctorantControllerFactory.php: 1 added line, 0 removed lines.
Original line number	Diff line number	Diff line
		@@ -21,6 +21,7 @@ class DoctorantControllerFactory
		/**
		* @var VariableService $variableService
		* @var DoctorantService $doctorantService
		* @var MailConfirmationService $mailConfirmationService
		*/
		$variableService = $controllerManager->getServiceLocator()->get('VariableService');
		$doctorantService = $controllerManager->getServiceLocator()->get('DoctorantService');

module/Application/src/Application/Controller/MailConfirmationController.php

+1 −3

Changes for module/Application/src/Application/Controller/MailConfirmationController.php: 1 added line, 3 removed lines.
Original line number	Diff line number	Diff line
		@@ -24,7 +24,6 @@ class MailConfirmationController extends AbstractController {

		public function indexAction()
		{

		$request = $this->getRequest();
		$id = $this->params()->fromRoute('id');

		@@ -85,7 +84,6 @@ class MailConfirmationController extends AbstractController {

		public function envoieAction()
		{

		$id = $this->params()->fromRoute('id');
		//$this->mailConfirmationService->generateCode($id);
		$mailConfirmation = $this->mailConfirmationService->getDemandeById($id);
		@@ -105,7 +103,7 @@ class MailConfirmationController extends AbstractController {

		$this->notificationService->notifierMailConfirmation($mailConfirmation, $titre, $corps);

		return $this->redirect()->toRoute('these');
		return $this->redirect()->toRoute("home");
		/** Branchement du mail mais peut être echanger avec une vue classique en
		* décommentant le code si dessous*/

module/Application/src/Application/Controller/Plugin/UrlDoctorant.php

+1 −1

Changes for module/Application/src/Application/Controller/Plugin/UrlDoctorant.php: 1 added line, 1 removed line.
Original line number	Diff line number	Diff line
		@@ -16,7 +16,7 @@ class UrlDoctorant extends UrlPlugin
		public function modifierPersopassUrl(These $these)
		{
		return $this->fromRoute('doctorant/modifier-persopass',
		['doctorant' => $these->getDoctorant()->getId()]
		['doctorant' => $these->getDoctorant()->getId(), 'back' => 0],[], true
		);
		}
		}
		No newline at end of file