Commit 06eeb7f8 authored by Stephane Bouvry's avatar Stephane Bouvry
Browse files

Lien des rapports par période

parent c9ace2ea

front/src/TimesheetActivitySynthesis.vue

+9 −3
Changes for front/src/TimesheetActivitySynthesis.vue: 9 added lines, 3 removed lines.
Original line number Diff line number Diff line
@@ -52,8 +52,14 @@ 
        </div>

      </section>



      <section v-for="entry in facet" class="synthesis">

        <div class="label-line">{{ entry.label }}</div>

      <section v-for="entry, key in facet" class="synthesis">

        <div class="label-line">

          {{ entry.label }}

          <a :href="'/feuille-de-temps/synthesisactivity?activity_id=' +synthesis.activity_id +'&format=pdf&period=' + key">

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

            Télécharger

          </a>

        </div>



        <div v-for="wp in entry.datas.current.workpackages" :title="wp.code +' - ' +wp.label" class="main research">

          <span class="value hours">{{ wp.total | duration }}</span>
@@ -77,7 +83,7 @@ 


      </section>



      <section class="synthesis heading">

      <section class="synthesis heading sum">

        <div class="label-line"> Total </div>



        <div v-for="wp in synthesis.headings.current.workpackages" class="main research">

module/Oscar/src/Oscar/Service/TimesheetService.php

+2 −1
Changes for module/Oscar/src/Oscar/Service/TimesheetService.php: 2 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -1697,7 +1697,8 @@ class TimesheetService implements UseOscarUserContextService, UseOscarConfigurat 


        $output = [

            'period_from' => $startPeriod->getPeriodLabel(),

            'period_to' => $endPeriod->getPeriodLabel()

            'period_to' => $endPeriod->getPeriodLabel(),

            'activity_id' => $activity->getId()

        ];



        ////////////////////////////////////////////////////////////////////////////:

module/Oscar/view/oscar/project-grant/show.phtml

+2 −0
Changes for module/Oscar/view/oscar/project-grant/show.phtml: 2 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -451,6 +451,7 @@ 
                </div>

            <?php endif; ?>



            <?php if ($this->grant()->privilege(\Oscar\Provider\Privileges::ACTIVITY_TIMESHEET_VIEW, $entity)): ?>

                <?php if( $entity->isTimesheetAllowed() ): ?>

                <a  href="<?=  $this->url('contract/timesheet', ['id' => $entity->getId()]) ?>"

                    class="btn btn-primary">
@@ -458,6 +459,7 @@ 
                    Feuilles de temps

                </a>

                <?php endif; ?>

            <?php endif; ?>



            <?php

            // -------------------------------------------------------------------------------------------------- JALONS

module/Oscar/view/oscar/project-grant/timesheet.phtml

+4 −0
Changes for module/Oscar/view/oscar/project-grant/timesheet.phtml: 4 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -94,6 +94,10 @@ 
        border-left: thin solid rgba(255,255,255,.5);

    }



    .heading.sum .value, .heading.sum .total{

        font-weight: bold;

    }



</style>

<div class="container">

    <h1>

public/js/oscar/dist/TimesheetActivitySynthesis.umd.js

+2 −2

File changed.

Preview size limit exceeded, changes collapsed.