removed Formatduration and fixed rounding error, working on overtime calculation
This commit is contained in:
@@ -1,6 +1,7 @@
|
||||
package helper
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"time"
|
||||
)
|
||||
|
||||
@@ -14,3 +15,23 @@ func GetMonday(ts time.Time) time.Time {
|
||||
}
|
||||
return ts
|
||||
}
|
||||
|
||||
// Converts duration to string
|
||||
func FormatDuration(d time.Duration) string {
|
||||
hours := int(d.Abs().Hours())
|
||||
minutes := int(d.Abs().Minutes()) % 60
|
||||
sign := ""
|
||||
if d < 0 {
|
||||
sign = "-"
|
||||
}
|
||||
switch {
|
||||
case hours > 0 && minutes == 0:
|
||||
return fmt.Sprintf("%s%dh", sign, hours)
|
||||
case hours > 0:
|
||||
return fmt.Sprintf("%s%dh %dmin", sign, hours, minutes)
|
||||
case minutes > 0:
|
||||
return fmt.Sprintf("%s%dmin", sign, minutes)
|
||||
default:
|
||||
return ""
|
||||
}
|
||||
}
|
||||
|
||||
@@ -15,3 +15,22 @@ func TestGetMonday(t *testing.T) {
|
||||
t.Error("Wrong date conversion!")
|
||||
}
|
||||
}
|
||||
|
||||
func TestFormatDuration(t *testing.T) {
|
||||
durations := []struct {
|
||||
name string
|
||||
duration time.Duration
|
||||
}{
|
||||
{"2h", time.Duration(120 * time.Minute)},
|
||||
{"30min", time.Duration(30 * time.Minute)},
|
||||
{"1h 30min", time.Duration(90 * time.Minute)},
|
||||
{"-1h 30min", time.Duration(-90 * time.Minute)},
|
||||
}
|
||||
for _, d := range durations {
|
||||
t.Run(d.name, func(t *testing.T) {
|
||||
if FormatDuration(d.duration) != d.name {
|
||||
t.Error("Format missmatch in Formatduration.")
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user