2024-09-05 - feature-2583 - Modified ProgressBar

Author: Luch76

server/src/main/java/com/objectcomputing/checkins/services/employee_hours/EmployeeHours.java

@@ -1,6 +1,7 @@
 package com.objectcomputing.checkins.services.employee_hours;
 
 import com.objectcomputing.checkins.converter.LocalDateConverter;
+import com.objectcomputing.checkins.util.Util;
 import io.micronaut.core.annotation.Introspected;
 import io.micronaut.core.annotation.Nullable;
 import io.micronaut.data.annotation.AutoPopulated;
@@ -117,8 +118,8 @@ public boolean equals(Object o) {
                 updatedDate.equals(that.updatedDate) &&
                 Float.compare(that.targetHours, targetHours) == 0 &&
                 asOfDate.equals(that.asOfDate) &&
-                Float.compare(that.billableUtilization, this.billableUtilization) == 0 &&
-                Float.compare(that.overtimeWorked, this.overtimeWorked) == 0
+                Util.floatCompareNullSafeAndEqualWhenBothNull(that.billableUtilization, this.billableUtilization) == 0 &&
+                Util.floatCompareNullSafeAndEqualWhenBothNull(that.overtimeWorked, this.overtimeWorked) == 0
                 ;
     }
 

server/src/main/java/com/objectcomputing/checkins/util/Util.java

@@ -31,4 +31,11 @@ public static List<String> nullSafeUUIDListToStringList(List<UUID> uuidList) {
         }
         return stringsList;
     }
+
+    public static int floatCompareNullSafeAndEqualWhenBothNull(Float f1, Float f2) {
+        if (f1 == null && f2 == null) return 0;
+        if (f1 == null || f2 == null) return 1;
+        return Float.compare(f1, f2);
+    }
+
 }

web-ui/src/components/contribution_hours/ProgressBar.jsx

@@ -44,8 +44,8 @@ const LinearBuffer = ({
     contributionHours = 925,
     targetHours = 1850,
     ptoHours = 0,
-    billableUtilization = 0,
-    overtimeWorked = 0,
+    billableUtilization,
+    overtimeWorked,
 }) => {
   return (
     <Root className={classes.root}>
@@ -67,10 +67,7 @@ const LinearBuffer = ({
         style={{ display: 'block' }}
       >
         Billable Hours: {billableHours} - Contribution Hours:{' '}
-        {contributionHours} - Target Hours: {targetHours} - PTO Hours:{' '}
-          {ptoHours} - Billable Utilization:{' '}
-          {billableUtilization} - Overtime Worked:{' '}
-          {overtimeWorked}
+        {contributionHours} - Target Hours: {targetHours} - PTO Hours:{' '} {ptoHours} - Billable Utilization:{' '} {(billableUtilization) ? billableUtilization : '(none)'} - Overtime Worked:{' '} {(overtimeWorked) ? overtimeWorked : '(none)'}
       </Typography>
     </Root>
   );