Compare commits

..

No commits in common. "5ab5ec6aec67e6809e2981026c1df306b5b557fb" and "2e09ef6c9ef0ccd147f476ad4d6361de5aa6f854" have entirely different histories.

View File

@ -406,11 +406,7 @@ 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 #'(lambda (task) (-map (-compose #'org-duration-to-minutes #'cdr))
(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)))
@ -438,8 +434,10 @@ 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"
(db/org--format-link-from-org-id task-id) (org-link-make-string (format "id:%s" task-id)
(or effort-string "")))) (org-entry-get (org-id-find task-id 'marker)
"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)))