Commit 7b290c13 authored by Stephane Bouvry's avatar Stephane Bouvry
Browse files

Ajout d'un statut "Erreur", possibiliter d'actualiser une étape en erreur pour la relancer

parent 47964021

public/dist/dist

0 → 120000
+1 −0
Original line number Diff line number Diff line 
./../../vendor/unicaen/signature/public/dist
 
 No newline at end of file

public/dist/manifest.json

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ 
    "css": [

      "assets/SignatureFlows-8ebbf3d5.css"

    ],

    "file": "assets/signatureflows-30528542.js",

    "file": "assets/signatureflows-f298f54a.js",

    "imports": [

      "_vendor.js",

      "_vendor2.js"

public/src/views/SignatureFlows.vue

+1 −1
Original line number Diff line number Diff line
@@ -146,7 +146,7 @@ 
                      id="enabled"

                      type="checkbox"

                      name="enabled"

                      class="form-control input-lg"/>

                      class=""/>

          </div>

          <section class="">

            <section>

src/Entity/Db/Process.php

+10 −1
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ namespace UnicaenSignature\Entity\Db; 
use DateTime;

use Doctrine\Common\Collections\ArrayCollection;

use Doctrine\ORM\Mapping as ORM;

use Oscar\Exception\OscarException;

use UnicaenSignature\Exception\SignatureException;



/**
@@ -246,13 +247,16 @@ class Process 


    public function isInProgress(): bool

    {

        return $this->getStatus() == Signature::STATUS_SIGNATURE_WAIT;

        return $this->getStatus() == Signature::STATUS_SIGNATURE_WAIT ||

            $this->getStatus() == Signature::STATUS_SIGNATURE_DRAFT ||

            $this->getStatus() == Signature::STATUS_SIGNATURE_ERROR;

    }



    public function isFinished(): bool

    {

        return

            $this->getStatus() != Signature::STATUS_SIGNATURE_WAIT &&

            $this->getStatus() != Signature::STATUS_SIGNATURE_ERROR &&

            $this->getStatus() != Signature::STATUS_SIGNATURE_DRAFT &&

            $this->getStatus() != Signature::STATUS_PROCESS_UNCONFIGURED;

    }
@@ -302,12 +306,17 @@ class Process 
        if ($this->getCurrentStep()) {

            $order = $this->getStep()->getOrder();

        }



        $return['current_step'] = $order;

        $return['total_steps'] = count($this->getSteps());



        $steps = [];



        foreach ($this->getSteps() as $step) {

            if( $step->getStatus() === Signature::STATUS_SIGNATURE_ERROR ) {

                $return['status'] = Signature::STATUS_SIGNATURE_ERROR;

                $return['status_text'] = "Erreur technique";

            }

            $steps[] = $step->toArray();

        }

        $return['steps'] = $steps;