Commit bf748e41 authored by Antony Le Courtes's avatar Antony Le Courtes
Browse files

Pouvoir désactiver la signature electronique par intervenant afin de gérer le... 

Pouvoir désactiver la signature electronique par intervenant afin de gérer le contrat avec un dépôt de fichier
parent aed4f323

data/ddl/table/INTERVENANT.php

+12 −0
Changes for data/ddl/table/INTERVENANT.php: 12 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -297,6 +297,18 @@ return [ 
            'position'    => 17,

            'commentaire' => NULL,

        ],

        'DESACTIVER_SIGNATURE'        => [

            'name'        => 'DESACTIVER_SIGNATURE',

            'type'        => 'int',

            'bdd-type'    => 'NUMBER',

            'length'      => 0,

            'scale'       => NULL,

            'precision'   => NULL,

            'nullable'    => FALSE,

            'default'     => '0',

            'position'    => 66,

            'commentaire' => NULL,

        ],

        'DISCIPLINE_ID'               => [

            'name'        => 'DISCIPLINE_ID',

            'type'        => 'int',

data/ddl_columns_pos.php

+48 −0
Changes for data/ddl_columns_pos.php: 48 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -873,6 +873,7 @@ return [ 
        'SITUATION_MATRIMONIALE_DATE',

        'SITUATION_MATRIMONIALE_ID',

        'FORMULE_CALCUL_ARRONDISSEUR',

        'DESACTIVER_SIGNATURE',

    ],

    'INTERVENANT_DOSSIER'                 => [

        'ID',
@@ -1120,6 +1121,7 @@ return [ 
        'REQUETE',

        'NUMERO',

        'MESSAGE_ERREUR',

        'OK',

    ],

    'PLAFOND_ETAT'                        => [

        'ID',
@@ -3127,6 +3129,52 @@ return [ 
        'tp',

        'autres',

    ],

    'TBL_SERVICE_DU'                      => [

        'ID',

        'ACTIF',

        'ANNEE_ID',

        'INTERVENANT_ID',

        'STATUT_ID',

        'SERVICE_STATUTAIRE',

        'SERVICE_DU',

        'DEPASSEMENT_SERVICE_DU_SANS_HC',

        'SERVICE_MODIFIE',

    ],

    'WORKFLOW_ETAPE'                      => [

        'ID',

        'CODE',

        'PERIMETRE_ID',

        'ROUTE',

        'ROUTE_INTERVENANT',

        'LIBELLE_INTERVENANT',

        'LIBELLE_AUTRES',

        'DESC_NON_FRANCHIE',

        'DESC_SANS_OBJECTIF',

        'ORDRE',

        'HISTO_CREATION',

        'HISTO_CREATEUR_ID',

        'HISTO_MODIFICATION',

        'HISTO_MODIFICATEUR_ID',

        'HISTO_DESTRUCTION',

        'HISTO_DESTRUCTEUR_ID',

        'ANNEE_ID',

    ],

    'WORKFLOW_ETAPE_DEPENDANCE'           => [

        'ID',

        'ETAPE_SUIVANTE_ID',

        'ETAPE_PRECEDANTE_ID',

        'ACTIVE',

        'TYPE_INTERVENANT_ID',

        'PERIMETRE_ID',

        'AVANCEMENT',

        'HISTO_CREATION',

        'HISTO_CREATEUR_ID',

        'HISTO_MODIFICATION',

        'HISTO_MODIFICATEUR_ID',

        'HISTO_DESTRUCTION',

        'HISTO_DESTRUCTEUR_ID',

        'ANNEE_ID',

    ],

];



//@formatter:on

module/Contrat/src/Controller/ContratController.php

+2 −1
Changes for module/Contrat/src/Controller/ContratController.php: 2 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -119,7 +119,8 @@ class ContratController extends AbstractController 
        $libelleCircuitSignature    = null;

        if (!empty($this->getServiceParametres()->get('signature_electronique_parapheur'))

            && $intervenant->getStatut()->getContratEtatSortie()->isSignatureActivation()

            && $intervenant->getStatut()->getContratEtatSortie()->getSignatureCircuit()) {

            && $intervenant->getStatut()->getContratEtatSortie()->getSignatureCircuit()

            && !$intervenant->isDesactiverSignature()) {

            $contratSignatureActivation = true;

            $libelleCircuitSignature    = $intervenant->getStatut()->getContratEtatSortie()->getSignatureCircuit()->getLabel();

module/Intervenant/src/Entity/Db/Intervenant.php

+18 −0
Changes for module/Intervenant/src/Entity/Db/Intervenant.php: 18 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -316,6 +316,8 @@ class Intervenant implements HistoriqueAwareInterface, ResourceInterface, Import 


    protected bool $irrecevable = false;



    protected bool $desactiverSignature = false;



    /**

     * @var string|null

     */
@@ -1718,4 +1720,20 @@ class Intervenant implements HistoriqueAwareInterface, ResourceInterface, Import 


        return $intervenant;

    }







    public function isDesactiverSignature(): bool

    {

        return $this->desactiverSignature;

    }







    public function setDesactiverSignature(bool $desactiverSignature): Intervenant

    {

        $this->desactiverSignature = $desactiverSignature;



        return $this;

    }

}

module/Intervenant/src/Entity/Db/Mapping/Intervenant.Entity.Db.Intervenant.dcm.xml

+1 −0
Changes for module/Intervenant/src/Entity/Db/Mapping/Intervenant.Entity.Db.Intervenant.dcm.xml: 1 added line, 0 removed lines.
Original line number Diff line number Diff line
@@ -101,6 +101,7 @@ 
        <field name="syncPec" type="boolean" column="SYNC_PEC" nullable="false"/>

        <field name="syncUtilisateurCode" type="boolean" column="SYNC_UTILISATEUR_CODE" nullable="false"/>

        <field name="irrecevable" type="boolean" column="IRRECEVABLE" nullable="true"/>

        <field name="desactiverSignature" type="boolean" column="DESACTIVER_SIGNATURE" nullable="true"/>

        <field name="numeroPec" type="string" column="NUMERO_PEC" length="255" nullable="true"/>