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

correction #50738 

(cherry picked from commit 920a53bf)
parent 69d8e232

module/Paiement/view/paiement/budget/engagements-liquidation.phtml

+49 −43
Original line number Diff line number Diff line
@@ -21,16 +21,18 @@ if ($structureElement) { 


<?php if ($structure): ?>

    <div class="engagement">

        <div class="row">



            <!-- Abondements par types de ressources -->

            <?php foreach ($dotations['typesRessources'] as $dtr):

                $canEdit = $this->isAllowed($dtr['entity'], $dtr['entity']->getPrivilegeBudgetEdition());

                ?>

            <div class="col-md-<?= floor(12 / count($dotations['typesRessources'])) ?>">

                <div class="col-md-6">

                    <h2><?= $dtr['entity']->getLibelle() ?></h2>

                    <table class="table table-bordered table-hover">

                        <?php foreach ($dtr['abondements'] as $libelle => $abondement): ?>

                            <tr>

                            <th><?= $abondement['libelle'] ?></th>

                                <td><?= $abondement['libelle'] ?></td>

                                <td class="dotation"><?php fdot($this, $dtr['entity'], $libelle, $abondement, $canEdit) ?></td>

                            </tr>

                        <?php endforeach; ?>
@@ -41,9 +43,9 @@ if ($structureElement) { 
                    </table>

                </div>

            <?php endforeach; ?>



        </div>

        <!-- Liquidation -->

        <div class="liquidation">

        <div class="liquidation row">

            <h2>Liquidation</h2>

            <table class="table table-bordered">

                <tr>
@@ -126,8 +128,9 @@ if ($structureElement) { 
    }



    ?>



    <div class="ha ha1 col-md-6" title="<?= $titleA1 ?>">

    <div class="container">

        <div class="row">

            <div class="ha ha1 col" title="<?= $titleA1 ?>">

                <?= Util::formattedNumber($data['anneeCivile1']['heures']) ?><span class="label">HETD</span>

                <?php if ($canEdit): ?>

                    <a href="<?= $dotEditUrl1 ?>" class="mod-ajax" data-submit-reload="true"
@@ -136,7 +139,7 @@ if ($structureElement) { 
                    </a>

                <?php endif; ?>

            </div>

    <div class="ha ha2 col-md-6" title="<?= $titleA2 ?>">

            <div class="ha ha2 col" title="<?= $titleA2 ?>">

                <?= Util::formattedNumber($data['anneeCivile2']['heures']) ?><span class="label">HETD</span>

                <?php if ($canEdit): ?>

                    <a href="<?= $dotEditUrl2 ?>" class="mod-ajax" data-submit-reload="true"
@@ -145,9 +148,12 @@ if ($structureElement) { 
                    </a>

                <?php endif; ?>

            </div>



    <div class="ha ha3 col-md-offset-3 col-md-6" title="<?= $titleA ?>">

        </div>

        <div class="row">

            <div class="ha ha3 col" title="<?= $titleA ?>">

                <?= Util::formattedNumber($data['heures']) ?><span class="label">HETD</span>

            </div>

        </div>

    </div>



<?php }
 
 No newline at end of file

public/css/app.css

+22971 −18616

File changed.

Preview size limit exceeded, changes collapsed.

public/css/budget.scss

+20 −30
Original line number Diff line number Diff line 


.engagement .ha {

  border-collapse: collapse;

    border:1px gray solid;

  border: 1px #dfdddd solid;

  text-align: right;

  margin: 0;

}



.engagement .label {
@@ -12,17 +13,11 @@ 
.engagement .ha.ha2 {

  border-left: none;

}



.engagement .ha.ha3 {

  border-top: none

}



.engagement td.dotation {

    padding: .2em;

}



.engagement td.dotation {

    padding: .2em;

}



.engagement td.hetd {

  text-align: right;
@@ -42,11 +37,6 @@ 
  text-align: center;

}



.engagement .liquidation table {

    width: auto;

    margin:auto;

}





table.budget-tbl {

  width: auto;