[BUGFIX] Afficher le nombre de jours d'une formation (PIX-10626)

#7826
1024pix · Jan 9, 2024 · e8fa61e · e8fa61e
2 parents ded4ef7 + 4d75228
commit e8fa61e
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 63 deletions.
diff --git a/mon-pix/app/components/training/card.hbs b/mon-pix/app/components/training/card.hbs
@@ -7,9 +7,7 @@
           <li class="training-card-content-infos-tag-list__type">
             {{this.type}}
           </li>
-          <li class="training-card-content-infos-tag-list__duration">
-            <time>{{this.durationFormatted}}</time>
-          </li>
+          <li class="training-card-content-infos-tag-list__duration"><time>{{this.durationFormatted}}</time></li>
         </ul>
       </PixTag>
     </div>

diff --git a/mon-pix/app/components/training/card.js b/mon-pix/app/components/training/card.js
@@ -5,18 +5,10 @@ export default class Card extends Component {
   @service intl;
 
   get durationFormatted() {
-    const formattedHours = [];
-    const { hours, minutes, seconds } = this.args.training.duration;
-    if (hours) {
-      formattedHours.push(hours + 'h');
-    }
-    if (minutes) {
-      formattedHours.push(minutes + 'm');
-    }
-    if (seconds) {
-      formattedHours.push(seconds + 's');
-    }
-    return formattedHours.join(' ');
+    const days = this.args.training.duration.days ? `${this.args.training.duration.days}j ` : '';
+    const hours = this.args.training.duration.hours ? `${this.args.training.duration.hours}h ` : '';
+    const minutes = this.args.training.duration.minutes ? `${this.args.training.duration.minutes}min` : '';
+    return `${days}${hours}${minutes}`.trim();
   }
 
   get type() {

diff --git a/mon-pix/app/styles/components/_training-card.scss b/mon-pix/app/styles/components/_training-card.scss
@@ -36,14 +36,15 @@
 
   & > * + *::before {
     margin: 0 1ch;
-    content: '-';
+    content: '•';
   }
 }
 
 .training-card-content-infos-tag-list__duration {
   max-width: 100%;
   overflow: hidden;
   white-space: nowrap;
+  text-transform: lowercase;
   text-overflow: ellipsis;
 }
 

diff --git a/mon-pix/tests/unit/components/training/card_test.js b/mon-pix/tests/unit/components/training/card_test.js
@@ -13,53 +13,13 @@ module('Unit | Component | Training | card', function (hooks) {
 
   module('#durationFormatted', function () {
     [
-      {
-        duration: {
-          hours: 10,
-          minutes: 11,
-          seconds: 12,
-        },
-        expectedResult: '10h 11m 12s',
-      },
-      {
-        duration: {
-          hours: 10,
-        },
-        expectedResult: '10h',
-      },
-      {
-        duration: {
-          minutes: 11,
-        },
-        expectedResult: '11m',
-      },
-      {
-        duration: {
-          seconds: 12,
-        },
-        expectedResult: '12s',
-      },
-      {
-        duration: {
-          minutes: 11,
-          seconds: 12,
-        },
-        expectedResult: '11m 12s',
-      },
-      {
-        duration: {
-          hours: 10,
-          seconds: 12,
-        },
-        expectedResult: '10h 12s',
-      },
-      {
-        duration: {
-          hours: 10,
-          minutes: 11,
-        },
-        expectedResult: '10h 11m',
-      },
+      { duration: { days: 2 }, expectedResult: '2j' },
+      { duration: { hours: 2 }, expectedResult: '2h' },
+      { duration: { minutes: 2 }, expectedResult: '2min' },
+      { duration: { hours: 10, minutes: 2 }, expectedResult: '10h 2min' },
+      { duration: { days: 1, hours: 4 }, expectedResult: '1j 4h' },
+      { duration: { days: 1, minutes: 30 }, expectedResult: '1j 30min' },
+      { duration: { days: 1, hours: 4, minutes: 30 }, expectedResult: '1j 4h 30min' },
     ].forEach(({ duration, expectedResult }) => {
       test(`should return ${expectedResult} for given duration ${JSON.stringify(duration)}`, function (assert) {
         // given