Commit fd73ccf0 authored by Stephane Bouvry's avatar Stephane Bouvry
Browse files

UI (Fiche activité) : Panneau "Fiances" terminé

parent 15c9a0ae

ui/src/styles/_oscar-core.scss

+14 −0
Changes for ui/src/styles/_oscar-core.scss: 14 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -272,3 +272,17 @@ label { 
    white-space: nowrap;

  }

}



.row-bordered {

  .col-md-3, .col-md-4, .col-md-6, .col-md-8, .col-md-12 {

    border-right: thin solid var(--bs-gray-300);

    padding: 0 1em;

    &:last-child {

      border-right: none;

      //padding-left: 0;

    }

    &:first-child {

      //padding-left: 0;

    }

  }

}
 
 No newline at end of file

ui/src/views/Activity.vue

+5 −9
Changes for ui/src/views/Activity.vue: 5 added lines, 9 removed lines.
Original line number Diff line number Diff line
@@ -311,9 +311,8 @@ 
        <div class="tab-pane fade" id="nav-financial"

             :class="{'active show': uiActiveTab === 'financial'}"

             role="tabpanel" aria-labelledby="nav-financial-tab" tabindex="0">

          Finances

          <div class="row">

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

          <div class="row row-bordered">

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

              <div class="budget-details">

                <div class="montant labeled-value labeled-value-hudge labeled-value-vertical">

                  <div class="label">{{ $filters.oscarText('amount') }}</div>
@@ -333,7 +332,7 @@ 
              </div>



            </div>

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

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

              <div class="labeled-value labeled-value-horizontal">

                <div class="label">{{ $filters.oscarText('tva') }}</div>

                <div class="value">{{ budget.tva }}</div>
@@ -355,7 +354,7 @@ 
                <div class="value">{{ budget.fraisDeGestionPartGestionnaire }}</div>

              </div>

            </div>

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

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

              <h3>Versements</h3>

              <div class="labeled-values-lines">

                <div class="labeled-value labeled-value-horizontal" v-for="v in paymentsSorted">
@@ -364,8 +363,8 @@ 
                    <i class="icon-valid" v-if="v.status === 'done'"></i>

                    <i class="icon-clock" v-if="v.status === 'futur'"></i>

                    <i class="icon-attention-1" v-if="v.status === 'late'"></i>

                    <i class="icon-attention-1" v-if="v.status === 'error'"></i>



                    {{ v.status }}

                    <strong class="main">{{ $filters.date(v.date) }}</strong>

                    <small class="addon">({{ $filters.timeAgo(v.date) }})</small>

                  </div>
@@ -374,11 +373,8 @@ 
                  </div>

                </div>

              </div>

           

            </div>

          </div>

          <hr>

          {{ budget }}

        </div>

        <div class="tab-pane fade" id="nav-dates"

             :class="{'active show': uiActiveTab === 'dates'}"