Merge pull request #304 from Ohtuilmo/change/chart_label_formatting

changed default chart bar label to new formt of 'X.Y h'
Ohtuilmo · May 2, 2024 · 5152019 · 5152019
2 parents 0df1121 + f4cf5d2
commit 5152019
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/frontend/src/components/TimeLogsPage/TimeLogChart.jsx b/frontend/src/components/TimeLogsPage/TimeLogChart.jsx
@@ -75,7 +75,8 @@ const TimeLogChart = (props) => {
             altLabel: `${hours} h, ${minutesLeft} min`,
             hLabel: `${hours} hours`,
             minutes: minutesLeft,
-            mLabel: `${minutesLeft} minutes`
+            mLabel: `${minutesLeft} minutes`,
+            defaultLabel: `${altHours.toFixed(1)} h`
           })
         }
       } else {
@@ -93,7 +94,8 @@ const TimeLogChart = (props) => {
             altLabel: `${hours} h, ${minutesLeft} min`,
             hLabel: `${hours} hours`,
             minutes: minutesLeft,
-            mLabel: `${minutesLeft} minutes`
+            mLabel: `${minutesLeft} minutes`,
+            defaultLabel: `${altHours.toFixed(1)} h`
           })
         }
       }
@@ -126,7 +128,7 @@ const TimeLogChart = (props) => {
                 dataKey='altHours'
                 background={false}
               >
-                <LabelList dataKey='altLabel' position='top' />
+                <LabelList dataKey='defaultLabel' position='top' />
                 {chartData.map((entry, index) => (
                   <Cell key={`cell-${index}`} fill={barColourSet[index % barColourSet.length]} />
                 ))}
@@ -180,7 +182,7 @@ const TimeLogChart = (props) => {
                   dataKey='altHours'
                   background={false}
                 >
-                  <LabelList dataKey='altLabel' position='top' />
+                  <LabelList dataKey='defaultLabel' position='top' />
                   {chartData.map((entry, index) => (
                     <Cell key={`cell-${index}`} fill={barColourSet[index % barColourSet.length]} />
                   ))}