Commit 446c5563 authored by Stephane Bouvry's avatar Stephane Bouvry
Browse files

Interface mise à jour 

Fix modèle pour les signatures libres
Mise à jour UI
Préparatif pour le visas internes
parent 91f11f1a

src/Controller/ProcessController.php

+5 −0
Changes for src/Controller/ProcessController.php: 5 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -138,6 +138,11 @@ class ProcessController extends AbstractActionController 
        $this->redirect()->toRoute('unicaen-signature/process');

    }



    /**

     * Affichage du document

     * 

     * @return void

     */

    public function previewDocumentAction()

    {

        try {

src/Controller/SignatureController.php

+9 −5
Changes for src/Controller/SignatureController.php: 9 added lines, 5 removed lines.
Original line number Diff line number Diff line
@@ -221,7 +221,7 @@ class SignatureController extends AbstractActionController 
    {

        try {

            return new ViewModel([

                                     'signatures' => $this->getSignatureService()->getSignatures()

                                     'signatures' => $this->getSignatureService()->getSignaturesSimples()

                                 ]);

        } catch (Exception $e) {

            $this->flash()->addErrorMessage($e->getMessage());
@@ -239,7 +239,7 @@ class SignatureController extends AbstractActionController 
    {

        $letterfileKey = $this->params('letterfile', null);

        $letterFile = $this->getSignatureService()->getLetterfileService()->getLetterFileStrategy($letterfileKey);

        $marksSelector = $this->getSignatureService()->getMarksSelectFrom(array_keys($letterFile->marksAvailable()));

        $marksSelector = $this->getSignatureService()->getMarksSelectFrom(array_keys($letterFile->getLevels()));

        $signature = new Signature();

        $signature->setLetterfileKey($letterFile->getName());

        $form = new SignatureForm($marksSelector);
@@ -286,7 +286,7 @@ class SignatureController extends AbstractActionController 
        } catch (Exception $e) {

            $this->flash()->addErrorMessage("Erreur : " . $e->getMessage());

        }

        return $this->redirect()->toRoute('unicaen-signature');

        return $this->redirect()->toRoute('unicaen-signature/signatures');

    }



    /**
@@ -301,11 +301,15 @@ class SignatureController extends AbstractActionController 
        } catch (Exception $e) {

            $this->flash()->addErrorMessage("Erreur : " . $e->getMessage());

        }

        return $this->redirect()->toRoute('unicaen-signature');

        return $this->redirect()->toRoute('unicaen-signature/signatures');

    }



    /**

     * @return Response

     */

    public function deleteAction()

    {

        // TODO à mieux gérer (suppression du document sous condition)

        try {

            $id = $this->params('id');

            $this->getSignatureService()->deleteSignatureById($id);
@@ -313,7 +317,7 @@ class SignatureController extends AbstractActionController 
        } catch (Exception $e) {

            $this->flash()->addErrorMessage("Erreur : " . $e->getMessage());

        }

        return $this->redirect()->toRoute('unicaen-signature');

        return $this->redirect()->toRoute('unicaen-signature/signatures');

    }



    public function downloadAction()

src/Entity/Db/ProcessStep.php

+1 −1
Changes for src/Entity/Db/ProcessStep.php: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ class ProcessStep 


    /**

     * @var Signature

     * @ORM\ManyToOne(targetEntity="Signature")

     * @ORM\OneToOne (targetEntity="Signature")

     */

    private Signature $signature;

src/Entity/Db/Signature.php

+24 −0
Changes for src/Entity/Db/Signature.php: 24 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -183,6 +183,12 @@ class Signature 
     */

    private bool $allSignToComplete = false;



    /**

     * @var ProcessStep|null

     * @ORM\OneToOne(targetEntity="ProcessStep", mappedBy="signature")

     */

    private ProcessStep|null $processStep;



    /**

     * @return int

     */
@@ -208,6 +214,24 @@ class Signature 
        return $this;

    }



    /**

     * @return ProcessStep|null

     */

    public function getProcessStep(): ?ProcessStep

    {

        return $this->processStep;

    }



    /**

     * @param ProcessStep|null $processStep

     */

    public function setProcessStep(?ProcessStep $processStep): self

    {

        $this->processStep = $processStep;

        return $this;

    }





    /**

     * @return DateTime|null

     */

src/Entity/Db/SignatureFlow.php

+9 −0
Changes for src/Entity/Db/SignatureFlow.php: 9 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -44,6 +44,15 @@ class SignatureFlow implements IObjectFormattable 
     */

    protected $steps;



    /**

     * @param ArrayCollection $steps

     */

    public function __construct()

    {

        $this->steps = new ArrayCollection();

    }





    /**

     * @return int

     */