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

Création d'un table d'aperçu pour les listes d'activités 

 - Ajout de trie sur le montant, le status, les dates de fin/début
 - Création d'un composant d'affichage 'OscarDateTime', permet d'afficher une date complète au survolle
parent f3500202

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

+4 −0
Original line number Diff line number Diff line
@@ -592,9 +592,13 @@ class ProjectGrantApiService implements 
                    'label' => $projectActivity->getLabel(),

                    'status' => $projectActivity->getStatus(),

                    'status_label' => $projectActivity->getStatusLabel(),

                    'statusCode' => $projectActivity->getStatus(),

                    'statusText' => $projectActivity->getStatusLabel(),

                    'numOscar' => $projectActivity->getOscarNum(),

                    'amount' => $projectActivity->getAmount(),

                    'codeEOTP' => $projectActivity->getCodeEOTP(),

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

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

                    'dateStart' => $this->formatDateTime($projectActivity->getDateStart()),

                    'dateEnd' => $this->formatDateTime($projectActivity->getDateEnd()),

                    'url_show' => $urlPlugin->fromRoute('contract/show', ['id' => $projectActivity->getId()]),

ui/src/Activity.js

+2 −2
Original line number Diff line number Diff line
@@ -42,8 +42,8 @@ app.config.globalProperties.$filters = { 
    filesize(size) {

        return filesize.filesize(size);

    },

    money(amount) {

        return money.money(amount);

    money(amount, currency='€') {

        return money.money(amount,currency);

    },

    log(message) {

        return traces.log(message);

ui/src/Project.js

+1 −1
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ app.config.globalProperties.$filters = { 
    filesize(size) {

        return filesize.filesize(size);

    },

    money(amount) {

    money(amount,currency='€') {

        return money.money(amount);

    },

    log(message) {

ui/src/components/OscarDateTime.vue

0 → 100644
+22 −0
Original line number Diff line number Diff line 
<script>

export default {

  name: "OscarDateTime",

  props: {

    date: {

      type: String,

      required: true

    }

  }

}

</script>



<template>

<datetime v-tooltip="$filters.dateFull(date)" v-if="date">

  {{ $filters.dateShort(date) }}

</datetime>

<span v-else>~</span>

</template>



<style scoped>



</style>
 
 No newline at end of file

ui/src/styles/_oscar-other.scss

+15 −3
Original line number Diff line number Diff line
@@ -233,7 +233,7 @@ span[class*="status"] { 
  &.valid:before, &.milestone-finishable-valid:before {

    /**/

    color: var(--bs-success);

    content: '\e85b'

    content: '\e85b';

  }

  &.warning:before, &.milestone-finishable-late:before {

    /**/
@@ -439,10 +439,22 @@ span[class*="status-400"] .icon:before { 






.sup {

  background: var(--bs-info);

  color: var(--bs-white);

  text-decoration: none;

  font-size: .75em;

  vertical-align: super;

}









.tr-line-total {

  font-weight: bold;

  background-color: var(--bs-info-bg-subtle);

  th, td {

    background: none;

  }

}





.compactable {