Compare commits

...

2 Commits

View File

@ -406,7 +406,11 @@ entries."
(deadline :from ,start-date :to ,end-date) (deadline :from ,start-date :to ,end-date)
(ts-active :from ,start-date :to ,end-date))))) (ts-active :from ,start-date :to ,end-date)))))
(total-time (->> tasks (total-time (->> tasks
(-map (-compose #'org-duration-to-minutes #'cdr)) (-map #'(lambda (task)
(let ((effort (cdr task)))
(if (null effort)
0
(org-duration-to-minutes effort)))))
-sum -sum
org-duration-from-minutes))) org-duration-from-minutes)))
(cons total-time tasks))) (cons total-time tasks)))
@ -434,10 +438,8 @@ understood by `org-read-date'."
(insert "| Task | Effort |\n|---|\n") (insert "| Task | Effort |\n|---|\n")
(pcase-dolist (`(,task-id . ,effort-string) (cdr task-summary)) (pcase-dolist (`(,task-id . ,effort-string) (cdr task-summary))
(insert (format "| %s | %s |\n" (insert (format "| %s | %s |\n"
(org-link-make-string (format "id:%s" task-id) (db/org--format-link-from-org-id task-id)
(org-entry-get (org-id-find task-id 'marker) (or effort-string ""))))
"ITEM"))
effort-string)))
(insert (format "|---|\n| Total | %s |\n|---|" (car task-summary))) (insert (format "|---|\n| Total | %s |\n|---|" (car task-summary)))
(org-table-align))) (org-table-align)))