From 11eb320c5561ef273eddcaf830ef4ba024e8ee3d Mon Sep 17 00:00:00 2001
From: chiayin <chiayin.kuo@dsp.im>
Date: Tue, 12 Sep 2023 11:48:32 +0800
Subject: [PATCH] Issues #83: done.

---
 .../Conformance/ConformanceSidebar.vue        |  1 -
 src/module/abbreviateNumber.js                | 36 +++++++++++++------
 src/stores/conformance.js                     |  5 +--
 3 files changed, 29 insertions(+), 13 deletions(-)

diff --git a/src/components/Discover/Conformance/ConformanceSidebar.vue b/src/components/Discover/Conformance/ConformanceSidebar.vue
index 970a210..1b2be23 100644
--- a/src/components/Discover/Conformance/ConformanceSidebar.vue
+++ b/src/components/Discover/Conformance/ConformanceSidebar.vue
@@ -70,7 +70,6 @@
       </div>
     </div>
     <!-- show bar -->
-    <!-- selectedRuleType === 'Activity sequence' && selectedActivitySequence === 'Sequence' && (selectedActSeqMore === 'Short loop(s)' || selectedActSeqMore === 'Self loop(s)') -->
     <ConformanceShowBar :class="isShowBar?'':'hidden'"
     :isSubmit="isSubmit"
     :isSubmitTask="isSubmitTask"
diff --git a/src/module/abbreviateNumber.js b/src/module/abbreviateNumber.js
index 2c7b346..5130960 100644
--- a/src/module/abbreviateNumber.js
+++ b/src/module/abbreviateNumber.js
@@ -1,14 +1,30 @@
 /**
- * 將數字轉換成簡寫的形式（1k、1m、1b等）
- * @param   {number} number
+ * 將數字轉換成簡寫的形式，設定 dhms 的數值
+ * @param {number} totalSeconds
  * @returns {string}
  */
-export default function abbreviateNumber(number) {
-  const SI_SYMBOLS = ["", "k", "m", "b", "t"];
-  const tier = Math.log10(Math.abs(number)) / 3 | 0;
-  const suffix = SI_SYMBOLS[tier];
-  const scale = Math.pow(10, tier * 3);
-  const scaledNumber = number / scale;
+export default function abbreviateNumber(totalSeconds) {
+  let seconds = 0;
+  let minutes = 0;
+  let hours = 0;
+  let days = 0;
+  let result = '';
+  let symbols = ['d', 'h', 'm', 's'];
 
-  return Math.round(scaledNumber) + suffix;
-}
+  totalSeconds = parseInt(totalSeconds);
+  if(!isNaN(totalSeconds)) {
+    seconds = totalSeconds % 60;
+    minutes = (Math.floor(totalSeconds - seconds) / 60) % 60;
+    hours = (Math.floor(totalSeconds / 3600)) % 24;
+    days = Math.floor(totalSeconds / (3600 * 24));
+  };
+
+  const units = [days, hours, minutes, seconds];
+  for(let i = 0; i < units.length; i++) {
+    if(units[i] > 0) result += units[i] + symbols[i];
+  }
+
+  if(totalSeconds === 0) result = '0s';
+
+  return result;
+};
diff --git a/src/stores/conformance.js b/src/stores/conformance.js
index 8b1f753..d709503 100644
--- a/src/stores/conformance.js
+++ b/src/stores/conformance.js
@@ -5,6 +5,7 @@ import {useToast} from 'vue-toast-notification';
 import 'vue-toast-notification/dist/theme-sugar.css';
 import moment from "moment";
 import { Decimal } from 'decimal.js';
+import abbreviateNumber from '@/module/abbreviateNumber.js';
 
 const loading = loadingStore(pinia);
 const $toast = useToast();
@@ -122,10 +123,10 @@ export default defineStore('conformanceStore', {
           c.facets.map(fac => {
             switch(fac.type) {
               case 'duration-list':
-                fac.value = fac.value.map(v => v !== null ? new Decimal(v.toFixed(2)) : null);
+                fac.value = fac.value.map(v => v !== null ? abbreviateNumber(new Decimal(v.toFixed(2))) : null);
                 fac.value = fac.value.join(', ');
                 break;
-              default:
+                default:
                 break;
             };
             return fac;