Commit 500d8661 authored by Florian Joriot's avatar Florian Joriot
Browse files

Merge remote-tracking branch 'origin/b24' into b24

parents fb35f998 bf093537
Loading
Loading
Loading
Loading
Loading
+11 −3
Changes for module/Contrat/src/Controller/ContratController.php: 11 added lines, 3 removed lines.
Original line number Diff line number Diff line
@@ -117,12 +117,18 @@ class ContratController extends AbstractController
        $contratSignatureActivation = false;
        $infosSignature             = [];
        $libelleCircuitSignature    = null;

        $modelContratPresent = $intervenant->getStatut()->getContratEtatSortie()!== null;
        $modelAvenantPresent = $intervenant->getStatut()->getAvenantEtatSortie()!== null;

        dump($intervenant->getStatut()->getContratEtatSortie());
        // recupere en fonction du statut, modele de contrat et/ou d'avenant
        if (!empty($this->getServiceParametres()->get('signature_electronique_parapheur'))
            && $intervenant->getStatut()->getContratEtatSortie()->isSignatureActivation()
            && $intervenant->getStatut()->getContratEtatSortie()->getSignatureCircuit()
            && $intervenant->getStatut()->getContratEtatSortie()?->isSignatureActivation()
            && $intervenant->getStatut()->getContratEtatSortie()?->getSignatureCircuit()
            && !$intervenant->isDesactiverSignature()) {
            $contratSignatureActivation = true;
            $libelleCircuitSignature    = $intervenant->getStatut()->getContratEtatSortie()->getSignatureCircuit()->getLabel();
            $libelleCircuitSignature    = $intervenant->getStatut()->getContratEtatSortie()?->getSignatureCircuit()->getLabel();

            /**
             * @var Contrat     $contrat
@@ -160,6 +166,8 @@ class ContratController extends AbstractController
            'infosSignature',
            'libelleCircuitSignature',
            'isMission',
            'modelContratPresent',
            'modelAvenantPresent'
        );
    }

+4 −2
Changes for module/Contrat/view/contrat/contrat/index.phtml: 4 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -19,6 +19,8 @@ use Contrat\Entity\Db\TblContrat;
 * @var array              $infosSignature
 * @var bool               $contratSignatureActivation
 * @var bool               $isMission
 * @var bool               $modelContratPresent
 * @var bool               $modelAvenantPresent
 */

$this->intervenant($intervenant)->renderTitle("Contrat/avenant");
@@ -115,9 +117,9 @@ echo $this->messenger() ?>
            <?php foreach ($contratsContractualises as $tblContrat) {
                $contrat = $tblContrat->getContrat();
                if ($contratSignatureActivation && !((!empty($contrat->getDateRetourSigne() || !$contrat->getFichier()->isEmpty()) && empty($contrat->getProcessSignature())))):
                    echo $this->partial('contrat/contrat/partial/contrat-signature-electronique', ['tblContrat' => $tblContrat, 'emailIntervenant' => $emailIntervenant, 'contratDirect' => $contratDirect, 'contratSignatureActivation' => $contratSignatureActivation, 'libelleCircuitSignature' => $libelleCircuitSignature, 'infosSignature' => $infosSignature]);
                    echo $this->partial('contrat/contrat/partial/contrat-signature-electronique', ['tblContrat' => $tblContrat, 'emailIntervenant' => $emailIntervenant, 'contratDirect' => $contratDirect, 'contratSignatureActivation' => $contratSignatureActivation, 'libelleCircuitSignature' => $libelleCircuitSignature, 'infosSignature' => $infosSignature, 'modelContratPresent' => $modelContratPresent, 'modelAvenantPresent' => $modelAvenantPresent]);
                else:
                    echo $this->partial('contrat/contrat/partial/contrat', ['tblContrat' => $tblContrat, 'emailIntervenant' => $emailIntervenant, 'contratDirect' => $contratDirect]);
                    echo $this->partial('contrat/contrat/partial/contrat', ['tblContrat' => $tblContrat, 'emailIntervenant' => $emailIntervenant, 'contratDirect' => $contratDirect, 'modelContratPresent' => $modelContratPresent, 'modelAvenantPresent' => $modelAvenantPresent]);
                endif;
            } ?>
        </div>
+46 −12
Changes for module/Contrat/view/contrat/contrat/partial/contrat.phtml: 46 added lines, 12 removed lines.
Original line number Diff line number Diff line
@@ -3,12 +3,17 @@
use Application\Provider\Privilege\Privileges;
use Contrat\Assertion\ContratAssertion;
use Contrat\Entity\Db\TblContrat;
use Contrat\Entity\Db\TypeContrat;


/**
 * @var              $this          \Application\View\Renderer\PhpRenderer
 * @var TblContrat   $tblContrat
 * @var bool $modelContratPresent
 * @var bool $modelAvenantPresent
 */

$modelPresent = $tblContrat->getTypeContrat()->getCode() == TypeContrat::CODE_CONTRAT ? $modelContratPresent : $modelAvenantPresent;
$contrat = $tblContrat->getContrat();

$validation     = $tblContrat->getValidation();
@@ -61,35 +66,64 @@ $card = ($retourSigne !== null) ? 'success' : ($validation ? 'info' : 'default')

<div class="contrat card bg-<?= $card ?>" id="contrat-<?= $contrat->getId() ?>">
    <div class="card-header card-header-h3">

        <!-- Envoi par mail -->
        <?php if ($urlExport && $urlEmail): ?>
            <span class="float-end">
            <span class="float-end"
                  >
                <?php if ($modelPresent): ?>

                <?php if ($disableEmail): ?>
                    <a class="disabled btn btn-seconrary" href="<?= $urlEmail ?>"
                    <a class="disabled btn btn-secondary"
                       href="<?= $urlEmail ?>"
                       title="L'intervenant du contrat n'a pas renseigné son email.">
                <?php else: ?>
                    <a data-event="envoi-mail-contrat"
                       class="ajax-modal btn btn-secondary"
                       href="<?= $urlEmail ?>"
                       title="Envoyer le contrat par mail">
                <?php endif; ?>
                        <?php if (!$disableEmail): ?>
                    <a data-event="envoi-mail-contrat" class="ajax-modal btn btn-secondary"
                       title="Envoyer le contrat par mail"
                        <?php else: ?>
                <a class="disabled btn btn-secondary"
                   href="#"
                   aria-disabled="true"
                   tabindex="-1"
                   title="Modèle absent pour ce contrat"
                   data-toggle="tooltip" data-placement="bottom" title="Tooltip on bottom">

                       href="<?= $urlEmail ?>">
                <?php endif; ?>
                    <i class="fas fa-paper-plane-top"></i> Envoyer par mail
                </a>
            </span>
        <?php endif; ?>
        <!-- Lien de téléchargement du fichier -->
        <?php if ($urlExport): ?>

        <!-- Export PDF -->
        <?php if ($urlExport): ?>
            <span class="float-end">
            <a class="btn btn-secondary" href="<?= $urlExport ?>" title="Exporter le contrat/avenant au format PDF">
            <?php if ($modelPresent): ?>
                <a class="btn btn-secondary"
                    href="<?= $urlExport ?>"
                    title="Exporter le contrat/avenant au format PDF">
            <?php else: ?>
                <a class="disabled btn btn-secondary"
                    href="#"
                    aria-disabled="true"
                    tabindex="-1"
                    title="Modèle absent pour ce contrat">
            <?php endif; ?>
                <i class="fas fa-upload"></i> Exporter en PDF
            </a>

        </span>
        <?php endif; ?>
        <!-- Lien de téléchargement du fichier -->

        <h3><?= $contrat->toString() ?>
            <?php if ($contrat->getStructure() != null): ?>- <?= $contrat->getStructure() ?><?php endif; ?></h3>
        <h3>
            <?= $contrat->toString() ?>
            <?php if ($contrat->getStructure() != null): ?>
                - <?= $contrat->getStructure() ?>
            <?php endif; ?>
        </h3>

    </div>

    <div class="card-body">