@eturnity/eturnity_reusable_components 8.16.9-EPDM-14690.0 → 8.16.9-EPDM-14690.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eturnity/eturnity_reusable_components",
-  "version": "8.16.9-EPDM-14690.0",
+  "version": "8.16.9-EPDM-14690.2",
   "files": [
     "dist",
     "src"

package/src/components/barchart/BottomFields.vue

@@ -93,7 +93,7 @@
                 "
                 :is-read-only="true"
                 :min-decimals="0"
-                :number-precision="2"
+                :number-precision="0"
                 text-align="center"
                 :value="calculateTotalValue(item.label)"
               />
@@ -115,7 +115,7 @@
                 :disabled="isInputsDisabled"
                 input-height="36px"
                 :min-decimals="0"
-                :number-precision="2"
+                :number-precision="0"
                 text-align="center"
                 :value="item.value"
                 @input-blur="handleInputBlur($event, null, item.label, null)"
@@ -131,7 +131,6 @@
 
 <script setup>
   import { ref, watch, watchEffect, onMounted } from 'vue'
-  import styled from 'vue3-styled-components'
   import InputNumber from '../inputs/inputNumber'
 
   import {
@@ -188,21 +187,6 @@
 
   const seriesData = ref([])
 
-  // onMounted(() => {
-  //   seriesData.value = props.series.map((item) => {
-  //     const data = item.data.map((d) => ({
-  //       label: d.label,
-  //       value: d.value,
-  //       originalValue: d.value,
-  //     }))
-
-  //     return {
-  //       name: item.name,
-  //       data,
-  //     }
-  //   })
-  // })
-
   watchEffect(() => {
     let isNewSetOfSeries = false
     const seriesDataCopy = [...seriesData.value]
@@ -279,7 +263,7 @@
 
   const getDisplayValue = (data, label, shouldRound = true) => {
     if (props.fieldMode === 'absolute') {
-      return data.find((d) => d.label === label)?.value || ''
+      return data.find((d) => d.label === label)?.value
     }
 
     const value = data.find((d) => d.label === label)?.value || 0

package/src/components/barchart/index.vue

@@ -252,10 +252,6 @@
       type: String,
       default: '',
     },
-    valueFormatter: {
-      type: Function,
-      default: null,
-    },
     isLegendShown: {
       type: Boolean,
       default: false,
@@ -388,7 +384,33 @@
   }
 
   const handleValueFormatter = (value) => {
-    return props.valueFormatter ? props.valueFormatter(value) : value
+    let formattedValue = value
+    if (value < 1000) {
+      formattedValue = numberToString({
+        value: formattedValue,
+        numberPrecision: 0,
+        minDecimals: 0,
+      })
+    } else if (value < 1000000) {
+      formattedValue = numberToString({
+        value: Number(formattedValue / 1000),
+        numberPrecision: 2,
+        minDecimals: 2,
+      })
+    } else {
+      formattedValue = numberToString({
+        value: Number(formattedValue / 1000000),
+        numberPrecision: 2,
+        minDecimals: 2,
+      })
+    }
+    if (value < 1000) {
+      return `${formattedValue} kWh`
+    } else if (value < 1000000) {
+      return `${formattedValue} MWh`
+    } else {
+      return `${formattedValue} GWh`
+    }
   }
 
   const getYAxisLabel = (label) => {

package/src/components/barchart/styles/bottomFields.js

@@ -59,8 +59,7 @@ export const InputGroup = styled('div', {
   barWidth: Number,
   isScrollable: Boolean,
 })`
-  ${(props) => (props.isScrollable ? 'min-width' : 'width')}:${(props) =>
-    props.barWidth}px;
+  ${(props) => (props.isScrollable ? 'min-width' : 'width')}: 70px;
   display: flex;
   justify-content: center;
   position: relative;