Commit 4e616eb2 authored by Antony Le Courtes's avatar Antony Le Courtes
Browse files

Correction bouton validation sur les pièces jointes

parent 70cb808d

module/Application/view/application/piece-jointe/lister.phtml

+4 −2
Changes for module/Application/view/application/piece-jointe/lister.phtml: 4 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -7,13 +7,14 @@ use Application\Provider\Privilege\Privileges; 
 * @var $pj   \Application\Entity\Db\PieceJointe

 */



$fichiers = $pj ? $pj->getFichier() : []; /* @var $fichiers \Application\Entity\Db\Fichier[] */

$fichiers = $pj ? $pj->getFichier() : [];

/* @var $fichiers \Application\Entity\Db\Fichier[] */





$canEdit     = $this->isAllowed(Privileges::getResourceId(Privileges::PIECE_JUSTIFICATIVE_EDITION));

$canDownload = $this->isAllowed(Privileges::getResourceId(Privileges::PIECE_JUSTIFICATIVE_TELECHARGEMENT));



if (!empty($fichiers)): ?>

if (count($fichiers) > 0): ?>



    <ul>

        <?php foreach ($fichiers as $fichier): ?>
@@ -40,6 +41,7 @@ if (!empty($fichiers)): ?> 
        <?php endforeach ?>

    </ul>





<?php else: ?>



    <p>Aucun.</p>

module/Application/view/application/piece-jointe/partial/piece-jointe.phtml

+4 −5
Changes for module/Application/view/application/piece-jointe/partial/piece-jointe.phtml: 4 added lines, 5 removed lines.
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ $uploader = $this->uploader()->setUrl($this->url('piece-jointe/intervenant/fichi 
                        </a>



                    </div>

                <?php elseif ((!$hasValidation && $canValider && $pj && $pj->getIntervenant()->getAnnee()->getId() == $annee->getId()) || ($hasValidation && $canDevalider && $pj && $pj->getIntervenant()->getAnnee()->getId() == $annee->getId())): ?>

                <?php else: ?>

                    <div class="validation-bar pull-right"

                         data-url="<?= $this->url('piece-jointe/intervenant/validation', ['typePieceJointe' => $tpj->getId()], [], true) ?>">

                        <?= $this->partial('application/piece-jointe/validation', compact('pj')) ?>
@@ -106,19 +106,18 @@ $uploader = $this->uploader()->setUrl($this->url('piece-jointe/intervenant/fichi 
<?php if ($hasValidation && $canArchiver && $pj && $pj->getIntervenant()->getAnnee()->getId() != $annee->getId()): ?>



    <div

            class="tpj <?= $obligatoire ? 'tpj-obligatoire ' : '' ?>tpj-<?= $tpj->getId() ?> panel panel-default upload-container"

            class="tpj <?= $obligatoire ? 'tpj-obligatoire ' : '' ?>tpj-archive-<?= $tpj->getId() ?> panel panel-default upload-container"

            data-tpj="archive-<?= $tpj->getId() ?>"

            style="display:none;"

            id="archive-form-pj-<?= $tpj->getId() ?>"

    >

        <div class="panel-heading panel-heading-h3">

            <h3>

                <?php if ((!$hasValidation && $canValider && $pj && $pj->getIntervenant()->getAnnee()->getId() == $annee->getId()) || ($hasValidation && $canDevalider && $pj && $pj->getIntervenant()->getAnnee()->getId() == $annee->getId())): ?>

                <div class="validation-bar pull-right"

                     data-url="<?= $this->url('piece-jointe/intervenant/validation', ['typePieceJointe' => $tpj->getId()], [], true) ?>">

                        <?= $this->partial('application/piece-jointe/validation', compact('pj')) ?>

                    <?= $this->partial('application/piece-jointe/validation', []) ?>

                </div>

                <?php endif; ?>





                <!--Infos sur document fourni sur une autre année-->

                <?=

module/Application/view/application/piece-jointe/validation.phtml

+1 −1
Changes for module/Application/view/application/piece-jointe/validation.phtml: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ use Application\Provider\Privilege\Privileges; 
 * @var $pj          \Application\Entity\Db\PieceJointe

 */



if (!$pj) return '';

if (empty($pj)) return '';



$params = [

    'pieceJointe' => $pj->getId(),