This commit is contained in:
@@ -56,7 +56,7 @@ func (d *WorkDay) GetWorkDays(card_uid string, tsFrom, tsTo time.Time) []WorkDay
|
||||
COALESCE(
|
||||
EXTRACT(EPOCH FROM SUM(
|
||||
CASE
|
||||
WHEN b.prev_check IN (1, 3) AND b.check_in_out IN (2, 4, 255)
|
||||
WHEN b.prev_check IN (1, 3) AND b.check_in_out IN (2, 4, 254)
|
||||
THEN b.timestamp - b.prev_timestamp
|
||||
ELSE INTERVAL '0'
|
||||
END
|
||||
@@ -65,7 +65,7 @@ func (d *WorkDay) GetWorkDays(card_uid string, tsFrom, tsTo time.Time) []WorkDay
|
||||
COALESCE(
|
||||
EXTRACT(EPOCH FROM SUM(
|
||||
CASE
|
||||
WHEN b.prev_check IN (2, 4, 255) AND b.check_in_out IN (1, 3)
|
||||
WHEN b.prev_check IN (2, 4, 254) AND b.check_in_out IN (1, 3)
|
||||
THEN b.timestamp - b.prev_timestamp
|
||||
ELSE INTERVAL '0'
|
||||
END
|
||||
@@ -189,10 +189,10 @@ func (d *WorkDay) GetWorkTimeString() (string, string) {
|
||||
|
||||
// returns bool wheter the workday was ended with an automatic logout
|
||||
func (d *WorkDay) RequiresAction() bool {
|
||||
if len(d.Bookings) > 0 {
|
||||
return d.Bookings[len(d.Bookings)-1].CheckInOut == 254
|
||||
if len(d.Bookings) == 0 {
|
||||
return false
|
||||
}
|
||||
return false
|
||||
return d.Bookings[len(d.Bookings)-1].CheckInOut == 254
|
||||
}
|
||||
|
||||
// returns a integer percentage of how much day has been worked of
|
||||
|
||||
@@ -193,3 +193,11 @@ func (w *WorkWeek) Accept() error {
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
func (w *WorkWeek) RequiresAction() bool {
|
||||
var requiresAction bool = true
|
||||
for _, day := range w.WorkDays {
|
||||
requiresAction = requiresAction || day.RequiresAction()
|
||||
}
|
||||
return requiresAction
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user