contrapunctus
/
chronometrist
Archived
1
3
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

Format old-break duration like other durations

This commit is contained in:
contrapunctus 2022-02-23 14:52:53 +05:30
parent c51f4a4560
commit 3d2bc8149e
2 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
elisp/chronometrist-third.el
View File

@ -131,19 +131,19 @@ and stopped when they clock in."
"Stop alert timers and update break time."
(chronometrist-third-stop-alert-timers)
(unless (zerop chronometrist-third-break-time)
(-let* (((&plist :stop stop) (cl-second (chronometrist-to-list (chronometrist-active-backend))))
(used-break-duration (ts-diff (ts-now) (chronometrist-iso-to-ts stop)))
(new-break-time (- chronometrist-third-break-time used-break-duration))
(old-break-time chronometrist-third-break-time)
(used-break-duration-string (format-seconds chronometrist-third-duration-format
used-break-duration)))
(setq chronometrist-third-break-time (if (> new-break-time 0) new-break-time 0))
(-let* (((&plist :stop stop) (cl-second (chronometrist-to-list (chronometrist-active-backend))))
(used-break (ts-diff (ts-now) (chronometrist-iso-to-ts stop)))
(used-break-string (format-seconds chronometrist-third-duration-format used-break))
(new-break (- chronometrist-third-break-time used-break))
(old-break chronometrist-third-break-time))
(setq chronometrist-third-break-time (if (> new-break 0) new-break 0))
(alert
(if (zerop chronometrist-third-break-time)
(format "You have used up all %s of your break time (%s break)"
old-break-time used-break-duration-string)
(format-seconds chronometrist-third-duration-format old-break)
used-break-string)
(format "You have used %s of your break time (%s left)"
used-break-duration-string
used-break-string
(format-seconds chronometrist-third-duration-format chronometrist-third-break-time)))))))
;; clock-in:1 ends here

18
elisp/chronometrist-third.org
View File

@ -155,19 +155,19 @@ and stopped when they clock in."
"Stop alert timers and update break time."
(chronometrist-third-stop-alert-timers)
(unless (zerop chronometrist-third-break-time)
(-let* (((&plist :stop stop) (cl-second (chronometrist-to-list (chronometrist-active-backend))))
(used-break-duration (ts-diff (ts-now) (chronometrist-iso-to-ts stop)))
(new-break-time (- chronometrist-third-break-time used-break-duration))
(old-break-time chronometrist-third-break-time)
(used-break-duration-string (format-seconds chronometrist-third-duration-format
used-break-duration)))
(setq chronometrist-third-break-time (if (> new-break-time 0) new-break-time 0))
(-let* (((&plist :stop stop) (cl-second (chronometrist-to-list (chronometrist-active-backend))))
(used-break (ts-diff (ts-now) (chronometrist-iso-to-ts stop)))
(used-break-string (format-seconds chronometrist-third-duration-format used-break))
(new-break (- chronometrist-third-break-time used-break))
(old-break chronometrist-third-break-time))
(setq chronometrist-third-break-time (if (> new-break 0) new-break 0))
(alert
(if (zerop chronometrist-third-break-time)
(format "You have used up all %s of your break time (%s break)"
old-break-time used-break-duration-string)
(format-seconds chronometrist-third-duration-format old-break)
used-break-string)
(format "You have used %s of your break time (%s left)"
used-break-duration-string
used-break-string
(format-seconds chronometrist-third-duration-format chronometrist-third-break-time)))))))
#+END_SRC