Commit d306564d authored by Jean-Philippe Metivier's avatar Jean-Philippe Metivier
Browse files

Push it

parent aeab9aba

src/UnicaenEvenement/Controller/EvenementConsoleController.php

+6 −0
Original line number Diff line number Diff line
@@ -73,6 +73,7 @@ class EvenementConsoleController extends AbstractConsoleController 
                }

            } catch (Exception $e) {

                $this->getConsole()->writeLine(sprintf("- échec du traitement de l'événement #%s", $evenement->getId()), ColorInterface::RED);

                $this->getConsole()->writeLine($e->getMessage(),ColorInterface::LIGHT_RED);

                $texte .= "<strong> Échec du traitement </strong> <br/>";

            }

        }
@@ -93,6 +94,11 @@ class EvenementConsoleController extends AbstractConsoleController 


        $journal->setLog($texte);

        $journal->setEtat($this->getEtatEvenementService()->findByCode(Etat::SUCCES));



        try {

            $this->getJournalService()->create($journal);

        } catch (Exception $e) {

            throw new RuntimeException("Oupsy", 0, $e);

        }

    }

}
 
 No newline at end of file

src/UnicaenEvenement/Service/CommonService.php

+2 −0
Original line number Diff line number Diff line
@@ -8,10 +8,12 @@ use Doctrine\ORM\Exception\ORMException; 
use Doctrine\ORM\QueryBuilder;

use DoctrineModule\Persistence\ProvidesObjectManager;

use RuntimeException;

use UnicaenApp\Service\EntityManagerAwareTrait;



abstract class CommonService

{

    use ProvidesObjectManager;

    use EntityManagerAwareTrait;



    /** REPOSITORY ****************************************************************************************************/

src/UnicaenEvenement/Service/EvenementGestion/EvenementGestionService.php

+7 −0
Original line number Diff line number Diff line
@@ -63,9 +63,11 @@ class EvenementGestionService 
        if ($evenement->getEtat()->getCode() == Etat::EN_ATTENTE AND $evenement->getDatePlanification() <= (new DateTime())) {



            $encours = $this->getEtatEvenementService()->findByCode(Etat::EN_COURS);

            $echec = $this->getEtatEvenementService()->findByCode(Etat::ECHEC);

            $evenement->setEtat($encours);

            $this->evenementService->update($evenement);



            try {

                $retour = $service->traiter($evenement);



                if ($retour !== null) {
@@ -74,6 +76,11 @@ class EvenementGestionService 
                    $evenement->setDateTraitement(new DateTime());

                    $this->evenementService->update($evenement);

                }

            } catch (Exception $e) {

                $evenement->setEtat($echec);

                $evenement->setLog($e->getMessage());

                $this->evenementService->update($evenement);

            }



            // gestion des récursions

            if ($evenement->getType()->getRecursion() !== null) {

src/UnicaenEvenement/View/Helper/JournalViewHelper.php

+3 −3
Original line number Diff line number Diff line
@@ -64,13 +64,13 @@ class JournalViewHelper extends AbstractHelper 
        return $view->partial('journal', ['journal' => $this->journal, 'journalTitle'=>$this->journalTitle]);

    }



    public function renderLog(): string|Partial

    public function renderLog(): null|string|Partial

    {

        if($this->journal == null) {

            return '';

        }

        $log = explode("<br/>", $this->journal->getLog());

        $nbLine = count($log);

        $log = $this->journal->getLog()?explode("<br/>", $this->journal->getLog()):null;

        $nbLine = $log?count($log):0;

        if($nbLine==0){

            return "--";

        }