Commit 4acc570b authored by Alexandre Zvenigorosky's avatar Alexandre Zvenigorosky
Browse files

Merge branches 'Centres-cout' and 'master' of git.unicaen.fr:open-source/OSE into Centres-cout 

# Conflicts:
#	composer.json
#	composer.lock
parent 4667d596

module/Application/view/application/centre-cout/index.phtml

+123 −123
Original line number Diff line number Diff line
@@ -22,7 +22,16 @@ foreach ($centreCouts as $fr) { 
}

$nTblListe = $i;

$i         = 0;

?>

while ($i < $nTblListe) {

    $j            = 0;

    $tblListe[$i] = [];

    foreach ($centreCouts as $frf) {

        if (($frf->getParent()) && ($frf->getParent()->getId() == $tblRef[$i]->getId())) {

            $tblListe[$i][$j++] = $frf;

        }

    }

    $i++;

} ?>

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

    <thead>

    <th style="word-wrap: break-word ; ">Code</th>
@@ -30,29 +39,20 @@ $i = 0; 
    <th style="word-wrap: break-word ; ">Activité</th>

    <th style="word-wrap: break-word ; ">Type de ressource</th>

    <th style="word-wrap: break-word ; ">Unité budgétaire</th>

    <?php if ($canEdit) echo '<th style="word-wrap: break-word ; ">Source<br>Actions</th>';

    else echo '<th style="word-wrap: break-word ; ">Source</th>'?>

    <?php if ($canEdit) {

        echo '<th style="word-wrap: break-word ; ">Source<br>Actions</th>';

    } else echo '<th style="word-wrap: break-word ; ">Source</th>' ?>

    <th style="word-wrap: break-word ; ">Structure</th>

    </thead>

    <tbody>

    <?php

    while ($i < $nTblListe) {

        $j            = 0;

        $tblListe[$i] = [];

        foreach ($centreCouts as $frf) {

            if (($frf->getParent()) && ($frf->getParent()->getId() == $tblRef[$i]->getId())) {

                $tblListe[$i][$j++] = $frf;

            }

        }

        $i++;

    }

    for ($i = 0;

         $i < $nTblListe;

         $i++) {

        $fr  = $tblRef[$i];

        $nFr = count($tblListe[$i]); ?>

        <tr>

        <td><?= $fr->getCode() . '<br>' ?></td>

            <td data-order="<?= $fr->getCode() ?>"><?= $fr->getCode() ?><br></td>

            <td><?= $fr->getLibelle() . '<br>' ?></td>

            <td><?= $fr->getActivite()->getLibelle() . '<br>' ?></td>

            <td><?= $fr->getTypeRessource() . '<br>' ?></td>
@@ -73,8 +73,7 @@ $i = 0; 
                    >

                        <span class="glyphicon glyphicon-remove"></span>

                    </a>

           <?php  }

           else echo $fr->getSource(); ?>

                <?php } else echo $fr->getSource(); ?>

            </td>

            <td>

                <?php
@@ -133,7 +132,8 @@ $i = 0; 
                 $j++) {

                $frf = $tblListe[$i][$j]; ?>

                <tr>

            <td data-order="<?= $fr->getCode() ?>" style="word-wrap: break-word; padding-left:30px; "><?= $frf->getCode() ?></td>

                    <td data-order="<?= $fr->getCode() ?>"

                        style="word-wrap: break-word; padding-left:30px; "><?= $frf->getCode() ?></td>

                    <td style="word-wrap: break-word ; "><?= $frf->getLibelle() ?></td>

                    <td style="word-wrap: break-word ; "><?= $frf->getActivite()->getLibelle() ?></td>

                    <td style="word-wrap: break-word ; "><?= $frf->getTypeRessource() ?></td>