removed Formatduration and fixed rounding error, working on overtime calculation
This commit is contained in:
@@ -4,7 +4,6 @@ import (
|
||||
"arbeitszeitmessung/helper"
|
||||
"database/sql"
|
||||
"encoding/json"
|
||||
"fmt"
|
||||
"log"
|
||||
"strconv"
|
||||
"time"
|
||||
@@ -180,23 +179,9 @@ func (d *WorkDay) getWorkTime() {
|
||||
d.calcPauseTime()
|
||||
}
|
||||
|
||||
// Converts duration to string
|
||||
func formatDuration(d time.Duration) string {
|
||||
hours := int(d.Abs().Hours())
|
||||
minutes := int(d.Abs().Minutes()) % 60
|
||||
switch {
|
||||
case hours > 0:
|
||||
return fmt.Sprintf("%dh %dmin", hours, minutes)
|
||||
case minutes > 0:
|
||||
return fmt.Sprintf("%dmin", minutes)
|
||||
default:
|
||||
return ""
|
||||
}
|
||||
}
|
||||
|
||||
func (d *WorkDay) GetWorkTimeString() (string, string) {
|
||||
workString := formatDuration(d.workTime)
|
||||
pauseString := formatDuration(d.pauseTime)
|
||||
workString := helper.FormatDuration(d.workTime)
|
||||
pauseString := helper.FormatDuration(d.pauseTime)
|
||||
return workString, pauseString
|
||||
}
|
||||
|
||||
@@ -210,7 +195,12 @@ func (d *WorkDay) RequiresAction() bool {
|
||||
|
||||
// returns a integer percentage of how much day has been worked of
|
||||
func (d *WorkDay) GetWorkDayProgress(user User) uint8 {
|
||||
defaultWorkTime := time.Duration(user.ArbeitszeitPerTag * float32(time.Hour))
|
||||
defaultWorkTime := time.Duration(user.ArbeitszeitPerTag * float32(time.Hour)).Round(time.Minute)
|
||||
progress := (d.workTime.Seconds() / defaultWorkTime.Seconds()) * 100
|
||||
return uint8(progress)
|
||||
}
|
||||
|
||||
func (d *WorkDay) CalcOvertime(user User) time.Duration {
|
||||
overtime := d.workTime - time.Duration(user.ArbeitszeitPerTag*float32(time.Hour)).Round(time.Minute)
|
||||
return overtime
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user