Commit 5c370403 authored by Stephane Bouvry's avatar Stephane Bouvry
Browse files

L'impact financier est maintenant visible dans le fiche activité

parent 77a33a7b

module/Oscar/src/Oscar/Service/ProjectGrantApiService.php

+2 −0
Original line number Diff line number Diff line
@@ -558,6 +558,7 @@ class ProjectGrantApiService implements 
            'status_label' => $activity->getStatusLabel(),

            'pfi' => $activity->getCodeEOTP(),

            'notefinanciere' => $activity->getNoteFinanciere(),

            'financialImpact' => $activity->getFinancialImpact(),

            'acronym' => $activity->getAcronym(),

            'project' => $project,

            'disciplines' => $activity->getDisciplinesArray(),
@@ -606,6 +607,7 @@ class ProjectGrantApiService implements 
            'amount' => $activity->getAmount(),

            'montant' => $activity->getAmount(),

            'currency' => $activity->getCurrency() ? $activity->getCurrency()->toJson() : null,

            'financialImpact' => $activity->getFinancialImpact(),

            'fraisDeGestion' => $activity->getFraisDeGestionDisplay(true, true, $this->getOscarConfigurationService()->getFraisDeGestionInclus()),

            'fraisDeGestionPartHebergeur' => $activity->getFraisDeGestionPartHebergeurDisplay(true, true, $this->getOscarConfigurationService()->getFraisDeGestionInclus()),

            'fraisDeGestionPartUnite' => $activity->getFraisDeGestionPartUniteDisplay(true, true, $this->getOscarConfigurationService()->getFraisDeGestionInclus()),

ui/src/views/Activity.vue

+14 −0
Original line number Diff line number Diff line
@@ -203,11 +203,23 @@ 
          </h1>

        </div>

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

          <div v-if="budget && credentials.budget.read">

            <div class="budget" v-if="budget.financialImpact == 'Aucune'" >

              <em>{{ $filters.oscarText("financialImpact") }}</em>

              <strong class="amount">

                Aucune

              </strong>

            </div>

            <div v-else>

              <div class="budget" v-if="budget && credentials.budget.read">

                <em>Montant</em>

                <strong class="text-private amount">{{ $filters.money(budget.montant) }} {{ budget.currency.symbol

                  }}</strong>

                <div class="details">

                  <small>

                    {{ $filters.oscarText("financialImpact") }} :

                    <b class="text-private">{{ budget.financialImpact }}</b>

                  </small>

                  <small>

                    {{ $filters.oscarText("fraisDeGestion") }} :

                    <b class="text-private">{{ budget.fraisDeGestion }}</b>
@@ -242,6 +254,8 @@ 
              </div>

            </div>

          </div>

        </div>

      </div>



      <p class="baseline activity-description" v-scroll-status v-if="core.description">

        {{ core.description }}