exot/.emacs.d
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Compare commits

base: exot:2ee8bde39763d32ca190a5d5fad9cb382cf47a2f
Branches Tags
exot:master
..
compare: exot:46797626e315a0c136ff41ffa12915e59ad2ed26
Branches Tags
exot:master

No commits in common. "2ee8bde39763d32ca190a5d5fad9cb382cf47a2f" and "46797626e315a0c136ff41ffa12915e59ad2ed26" have entirely different histories.
2ee8bde397 ... 46797626e3

1 changed files with 18 additions and 32 deletions
Show Stats Expand all files Collapse all files

50
site-lisp/db-org.el
View File

@ -749,12 +749,7 @@ PARAMS is a property list of the following parameters:
weekends, use \"Sat\\|Sun\" as regular expression.
This can also be a function taking a formatted timestamp as
argument and returning non-nil when the date should be skipped.
`:work-hours'
The time available per day for work, given as duration string.
Defauls to \"8:00\"."
argument and returning non-nil when the date should be skipped."
(let* ((start-date (org-read-date t t
(or (plist-get params :start-date)
"00:00")))
@ -772,56 +767,47 @@ PARAMS is a property list of the following parameters:
#'(lambda (x) (string-match arg x)))
((and (pred functionp) fun) fun)
(_ (user-error "Invalid argument to :skip-matches: %s" arg))))
(work-hours (or (plist-get params :work-hours)
"8:00"))
date-range)
;; Check input
(unless (string-match-p (rx bos "+" (+ digit) (in "dwmy") eos)
increment)
(user-error "Increment must be of the form +1d, +2m, +3y, …, but it's %s" increment))
(unless (org-duration-p work-hours)
(user-error "Work hours must be a duration string, but it's %s" work-hours))
;; Compute range of dates to check; simple but potentially costly approach
;; taken from https://sachachua.com/blog/2015/08/org-mode-date-arithmetic/;
;; maybe consider `org-read-date-get-relative' as well?
(let ((current start-date)
current-formatted)
(let ((current start-date))
(while (or (time-less-p current end-date)
(time-equal-p current end-date))
(setq current (org-read-date t t
;; Add an extra + to ensure we increase the amount of time
;; relative to the given default time string.
;; Add an extra + to ensure we increase the
;; amount of time relative to the given
;; default time string.
(format "+%s" increment)
nil current)
current-formatted (format-time-string timestamp-format current))
(unless (funcall skipper current-formatted)
(push current-formatted date-range))))
nil current))
(push current date-range)))
(setq date-range (nreverse (cdr date-range)))
(insert (format "#+CAPTION: Workload Overview Report at [%s] with start date [%s]\n"
(format-time-string timestamp-format (current-time))
(format-time-string timestamp-format start-date)))
(insert "| End Time | Planned Total | Utilization |\n| <r> | <r> | <r> |\n|---|\n")
(insert "| End Time | Planned Total |\n| <r> | <r> |\n|---|\n")
;; Compute workload report for each date and record the total time;
;; XXX: this might be slow, try to reduce the calls to `db/org-planned-tasks-in-range'.
(let ((days 0))
;; XXX: this might be slow, try to reduce the calls to
;; `db/org-planned-tasks-in-range'.
(dolist (interval-end-date date-range)
(let ((total-time (car (db/org-planned-tasks-in-range
;; Set start date to nil to also include tasks scheduled or deadlined
;; before `start-date', as those are also still open and need to be
;; done somewhen.
;; Set start date to nil to also include tasks
;; scheduled or deadlined before `start-date', as
;; those are also still open and need to be done
;; somewhen.
nil
interval-end-date
(format-time-string timestamp-format interval-end-date)
org-ql-match))))
(let ((utilization (* (/ (org-duration-to-minutes total-time)
(* (cl-incf days)
(org-duration-to-minutes work-hours)))
100)))
(insert (format "| [%s] | %s | %.2f%% |\n" interval-end-date total-time utilization))))))
(let ((interval-end-date (format-time-string timestamp-format interval-end-date)))
(unless (funcall skipper interval-end-date)
(insert (format "| [%s] | %s |\n" interval-end-date total-time))))))
(insert "|--|")
(org-table-align)))