Commit 6bbcc763 authored by Stephane Bouvry's avatar Stephane Bouvry
Browse files

Mise en Page et navigation vers les différentes vues de synthèse

parent 098e82bb

module/Oscar/view/oscar/timesheet/synthesis-activity-period.phtml

+6 −1
Changes for module/Oscar/view/oscar/timesheet/synthesis-activity-period.phtml: 6 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -37,6 +37,8 @@ $labels = [ 
    .duration {

        text-align: right;

    }





</style>

<table class="table table-condensed" style="border: 0">

    <thead>
@@ -45,7 +47,10 @@ $labels = [ 
            <th class="research" colspan="<?= count($wps)+1 +count($ces)+2 ?>"><i class="icon-beaker"></i> Recherche</th>



            <?php foreach ($othersGroups as $k=>$othersGroup):?>

                <th class="<?= $k ?>" colspan="<?= count($othersGroup)+(count($othersGroup)>1 ? 1 : 0) ?>"><?= $labels[$k] ?></th>

                <th class="<?= $k ?>" colspan="<?= count($othersGroup)+(count($othersGroup)>1 ? 1 : 0) ?>">

                    <i class="icon-<?= $k ?>"></i>

                    <?= $labels[$k] ?>

                </th>

            <?php endforeach; ?>

        </tr>

        <tr>

module/Oscar/view/oscar/timesheet/synthesis-all.phtml

+27 −5
Changes for module/Oscar/view/oscar/timesheet/synthesis-all.phtml: 27 added lines, 5 removed lines.
Original line number Diff line number Diff line
@@ -72,8 +72,15 @@ 
            <h1 class="row">{{ y.label }} <strong class="total">{{ y.total | formatDuration }}</strong></h1>

            <section v-for="p in y.periods" class="period">

            <h2 class="row">

                <span><i class="icon-calendar"></i>

                {{ p.label | formatPeriod }}</span>

                <span>

                    <i class="icon-calendar"></i>

                    {{ p.label | formatPeriod }}

                    <a :href="'/feuille-de-temps/synthesisactivity?activity_id=<?= $activity->getId() ?>&format=html&period=' + p.label" class="btn btn-xs btn-primary">

                        <i class="icon-calendar"></i>

                        Feuille de temps de l'activité

                    </a>

                </span>



                <small class="total">

                    Total pour <?= $activity->getAcronym() ?> :

                    <strong>{{ p.total | formatDuration }} </strong>
@@ -85,7 +92,16 @@ 
                    <strong class="person">

                        <i class="icon-user"></i> {{ l.label }}



                    <a href="#" @click.prevent="details(l.personId, p.label)">Détails</a>

                        <a href="#" @click.prevent="details(l.personId, p.label)" class="btn btn-xs btn-primary">

                            <i class="icon-calendar"></i>

                            Répartition mensuelle

                        </a>



                        <a :href="'/feuille-de-temps/excel?action=export&period=' +p.label +'&personid=' + l.personId" class="btn btn-xs btn-default">

                            <i class="icon-file-excel"></i>

                            Feuille de temps (Excel)

                        </a>



                    </strong>

                    <strong class="main">

                        <i class="icon-cubes"></i>
@@ -93,8 +109,14 @@ 
                        {{ l.main | formatDuration }}

                    </strong>

                </h4>

                <div><a v-if="filterPersonId == null" href="#" @click.prevent="filterPersonId = l.personId"><small>Afficher uniquement <strong>{{ l.label }}</strong></small></a>

                    <a v-else href="#" @click.prevent="filterPersonId = null"><small>Afficher tout le monde</small></a></div>

                <div>

                    <a v-if="filterPersonId == null" href="#" @click.prevent="filterPersonId = l.personId">

                        <small>Afficher uniquement <strong>{{ l.label }}</strong></small>

                    </a>

                    <a v-else href="#" @click.prevent="filterPersonId = null">

                        <small>Afficher tout le monde</small>

                    </a>

                </div>

                <section class="details">

                    <article v-for="d in l.details" class="detail row">

                        <strong v-if="d.type == 'wp'">

public/css/_common.scss

+2 −0
Changes for public/css/_common.scss: 2 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -2579,8 +2579,10 @@ span[class*="status-400"] .icon:before { 
}



[class*="icon-conges"]:before { content: '\e8a2'; }

[class*="icon-abs"]:before { content: '\e8a2'; }

[class*="icon-training"]:before { content: '\e88c'; }

[class*="icon-teaching"]:before { content: '\e877'; }

[class*="icon-education"]:before { content: '\e877'; }

[class*="icon-sickleave"]:before { content: '\e874'; }

[class*="icon-absent"]:before { content: '\e886'; }

[class*="icon-research"]:before { content: '\e891'; }

public/css/adaj.css

+6 −0
Changes for public/css/adaj.css: 6 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -7207,12 +7207,18 @@ span[class*="status-400"] .icon:before { 
[class*="icon-conges"]:before {

  content: '\e8a2'; }



[class*="icon-abs"]:before {

  content: '\e8a2'; }



[class*="icon-training"]:before {

  content: '\e88c'; }



[class*="icon-teaching"]:before {

  content: '\e877'; }



[class*="icon-education"]:before {

  content: '\e877'; }



[class*="icon-sickleave"]:before {

  content: '\e874'; }

public/css/app-beta.css

+6 −0
Changes for public/css/app-beta.css: 6 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -7207,12 +7207,18 @@ span[class*="status-400"] .icon:before { 
[class*="icon-conges"]:before {

  content: '\e8a2'; }



[class*="icon-abs"]:before {

  content: '\e8a2'; }



[class*="icon-training"]:before {

  content: '\e88c'; }



[class*="icon-teaching"]:before {

  content: '\e877'; }



[class*="icon-education"]:before {

  content: '\e877'; }



[class*="icon-sickleave"]:before {

  content: '\e874'; }