diff options
| -rw-r--r-- | accounts/gkleen@sif/shell/quickshell/Clock.qml | 2 | ||||
| -rwxr-xr-x | overlays/worktime/worktime/__main__.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/accounts/gkleen@sif/shell/quickshell/Clock.qml b/accounts/gkleen@sif/shell/quickshell/Clock.qml index b7004528..58a80b8b 100644 --- a/accounts/gkleen@sif/shell/quickshell/Clock.qml +++ b/accounts/gkleen@sif/shell/quickshell/Clock.qml | |||
| @@ -148,7 +148,7 @@ Item { | |||
| 148 | function scrollYear(event) { | 148 | function scrollYear(event) { |
| 149 | angleRem += event.angleDelta.y; | 149 | angleRem += event.angleDelta.y; |
| 150 | const d = Math.round(angleRem * sensitivity); | 150 | const d = Math.round(angleRem * sensitivity); |
| 151 | yearCalendar.year += d; | 151 | yearCalendar.year -= d; |
| 152 | angleRem -= d / sensitivity; | 152 | angleRem -= d / sensitivity; |
| 153 | } | 153 | } |
| 154 | 154 | ||
diff --git a/overlays/worktime/worktime/__main__.py b/overlays/worktime/worktime/__main__.py index ffeb1b84..5ab07590 100755 --- a/overlays/worktime/worktime/__main__.py +++ b/overlays/worktime/worktime/__main__.py | |||
| @@ -378,7 +378,7 @@ class Worktime(object): | |||
| 378 | if self.would_be_workday(day) and self.start_date.date() <= day and day <= self.end_date.date(): | 378 | if self.would_be_workday(day) and self.start_date.date() <= day and day <= self.end_date.date(): |
| 379 | if excused_kind == 'leave': | 379 | if excused_kind == 'leave': |
| 380 | self.leave_days.add(day) | 380 | self.leave_days.add(day) |
| 381 | elif time is not None and time >= self.time_per_day(day): | 381 | elif time is not None and time >= self.time_per_day(day) or time is None: |
| 382 | self.excused_days.add(day) | 382 | self.excused_days.add(day) |
| 383 | holidays[day] = time if time is not None else self.time_per_day(day) | 383 | holidays[day] = time if time is not None else self.time_per_day(day) |
| 384 | except IOError as e: | 384 | except IOError as e: |
