Commit 930d924e authored by Stephane Bouvry's avatar Stephane Bouvry
Browse files

écran général / numérotation (fix des numéros en cours)

parent bd6b1981

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

+1 −0
Original line number Diff line number Diff line
@@ -661,6 +661,7 @@ class ProjectGrantApiService implements 
            'fraisDeGestionPartUnite' => $activity->getFraisDeGestionPartUniteDisplay(true, true, $this->getOscarConfigurationService()->getFraisDeGestionInclus()),

            'fraisDeGestionPartGestionnaire' => $activity->getFraisDeGestionPartGestionnaireDisplay(true, true, $this->getOscarConfigurationService()->getFraisDeGestionInclus()),

            'tva' => (string)$activity->getTva(),

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

            'assietteSubventionnable' => $activity->getAssietteSubventionnable(),

        ];

        return $out;

ui/src/styles/_oscar-card.scss

+39 −41
Original line number Diff line number Diff line
@@ -17,47 +17,6 @@ 
    border-left-color: $colorGreyMedium;

  }



  .status {

    text-shadow: none;

    background: var(--bs-gray-300);

    color: var(--bs-gray-600);

    &.status-404 {

      background: var(--bs-danger);

      color: var(--bs-white);

    }



    &[class*='status-10'] {

      background-color: var(--p-green-100);

      color: var(--p-green-700);

      i:before { color: var(--p-green-700); }

    }



    &.status-101 {

      background: var(--bs-success);

      color: var(--bs-white);

      i:before { color: var(--bs-white); }

    }

    &.status-102 {

      background: var(--bs-gray-600);

      color: var(--bs-white);

      i:before { color: var(--bs-white); }

    }



    &[class*='status-2'] {

      background-color: var(--p-red-100);

      color: var(--p-red-700);

      i:before { color: var(--p-red-700); }

    }



    &[class*='status-4'] {

      background-color: var(--p-red-700);

      color: var(--p-red-100);

      i:before { color: var(--p-red-100); }

    }





  }



  .card-title {

    display: flex;

    font-size: 1.25em;
@@ -225,3 +184,42 @@ $bootstrapNames: ("info","danger","waring","success"); 
    }

  }

}



.cartouche.status {

  text-shadow: none;

  background: var(--bs-gray-300);

  color: var(--bs-gray-600);

  &.status-404 {

    background: var(--bs-danger);

    color: var(--bs-white);

  }



  &[class*='status-10'] {

    background-color: var(--p-green-100);

    color: var(--p-green-700);

    i:before { color: var(--p-green-700); }

  }



  &.status-101 {

    background: var(--bs-success);

    color: var(--bs-white);

    i:before { color: var(--bs-white); }

  }

  &.status-102 {

    background: var(--bs-gray-600);

    color: var(--bs-white);

    i:before { color: var(--bs-white); }

  }



  &[class*='status-2'] {

    background-color: var(--p-red-100);

    color: var(--p-red-700);

    i:before { color: var(--p-red-700); }

  }



  &[class*='status-4'] {

    background-color: var(--p-red-700);

    color: var(--p-red-100);

    i:before { color: var(--p-red-100); }

  }

}
 
 No newline at end of file

ui/src/views/Activity.vue

+147 −240

File changed.

Preview size limit exceeded, changes collapsed.