Commit 45414c78 authored by Jean-Philippe Metivier's avatar Jean-Philippe Metivier
Browse files

Mise en forme affichage des journaux

parent 02c96808

view/unicaen-evenement/index/index.phtml

+28 −0
Original line number Diff line number Diff line
@@ -25,6 +25,9 @@ $canVisualiserEtat = $this->isAllowed(EvenementinstancePrivileges::getResourceI 
$canVisualiserType  = $this->isAllowed(EvenementtypePrivileges::getResourceId(EvenementtypePrivileges::TYPE_CONSULTATION));



$this->headTitle("Les Évènements");



$last = null;

if (!empty($journaux)) $last = $journaux[0];

?>



<h1 class="page-header">
@@ -34,6 +37,31 @@ $this->headTitle("Les Évènements"); 
    Les Évènements

</h1>





<?php if ($last !== null) : ?>

    <div class="panel panel-default">

        <div class="panel-heading">Dernier journal d'exécution</div>

        <div class="panel-body">

            <div class="row">

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

                    <dl class="dl-horizontal">

                        <dt>Identifiant</dt>

                        <dd><?php echo $last->getId(); ?></dd>

                        <dt>Date d'éxecution</dt>

                        <dd><?php echo $last->getDate()->format('d/m/Y'); ?></dd>

                        <dt>État</dt>

                        <dd><?php echo $this->etat($last->getEtat()); ?> </dd>

                    </dl>

                </div>

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

                    <b>Trace d'exécution</b> <br/>

                    <?php echo $last->getLog(); ?>

                </div>

            </div>

        </div>

    </div>

<?php endif; ?>



<div role="tabpanel">

    <ul class="nav nav-tabs" role="tablist">

        <?php if($canVisualiserEvenement): ?>

view/unicaen-evenement/index/liste-journal.phtml

+23 −13
Original line number Diff line number Diff line
@@ -20,6 +20,11 @@ use UnicaenEvenement\Entity\Db\Journal; 
    </thead>

    <tbody>

        <?php foreach ($journaux as $journal) : ?>

            <?php

            $log = explode("<br/>", $journal->getLog());

            $nbLine = count($log);

            ?>

            <?php if ($nbLine > 2) : ?>

                <tr>

                    <td>

                        <?php echo $journal->getId(); ?>
@@ -28,22 +33,27 @@ use UnicaenEvenement\Entity\Db\Journal; 
                        <?php echo $journal->getDate()->format('d/m/Y'); ?> <br/>

                        <?php echo $journal->getDate()->format('H:i:s'); ?>

                    </td>

                <td title="<?php echo $journal->getLog(); ?>" data-html="true" data-toggle="tooltip">

                    <?php

                        $log = explode("<br/>", $journal->getLog());

                        $nbLine = count($log);

                    ?>

                    <?php echo $log[0]; ?> <br/>

                    <?php for ($line = 1 ; $line < ($nbLine - 1) AND ($line < 2 OR $nbLine === 4); $line++) : ?>

                        <?php echo $log[$line]; ?> <br/>

                    <?php endfor; ?>

                    <?php if ($nbLine > 4) : ?>

                        <?php echo "..."; ?> <br/>

                    <?php endif; ?>

                    <?php echo $log[$nbLine - 1]; ?>

<!--                    <td title="--><?php //echo $journal->getLog(); ?><!--" data-html="true" data-toggle="tooltip">-->

<!---->

<!--                        --><?php //echo $log[0]; ?><!-- <br/>-->

<!--                        --><?php //for ($line = 1 ; $line < ($nbLine - 1) AND ($line < 2 OR $nbLine === 4); $line++) : ?>

<!--                            --><?php //echo $log[$line]; ?><!-- <br/>-->

<!--                        --><?php //endfor; ?>

<!--                        --><?php //if ($nbLine > 4) : ?>

<!--                            --><?php //echo "..."; ?><!-- <br/>-->

<!--                        --><?php //endif; ?>

<!--                        --><?php //echo $log[$nbLine - 1]; ?>

<!--                    </td>-->

                    <td>

                        <small>

                        <?php foreach ($log as $line) : ?>

                        <?php echo $line; ?> <br/>

                        <?php endforeach; ?>

                        </small>

                    </td>

                    <td> <?php echo $this->etat($journal->getEtat()); ?> </td>

                </tr>

            <?php endif; ?>

        <?php endforeach; ?>

    </tbody>

</table>