ndwarshuis
/
org-mode
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

org-taskjuggler.el: Make project umbrella task optional 

* org-taskjuggler.el (org-export-taskjuggler-keep-project-as-task): Add
new option.
(org-export-as-taskjuggler): Optionally drop the topmost "task"
(project).
(org-taskjuggler-assign-task-ids): Adapt path computation by optionally
dropping the topmost component (project).

Introduce `org-export-taskjuggler-keep-project-as-task' as a flag to
toggle the behavior. Keep old behavior as default.
This commit is contained in:
Yann Hodique 2012-08-16 21:02:05 +02:00 committed by Bastien Guerry
parent a35500b842
commit c97dbf12ae
1 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
lisp/org-taskjuggler.el
View File

@ -264,6 +264,14 @@ but before any resource and task declarations."
the corresponding resource." the corresponding resource."
:group 'org-export-taskjuggler) :group 'org-export-taskjuggler)
(defcustom org-export-taskjuggler-keep-project-as-task t
"Whether to keep the project headline as an umbrella task for
all declared tasks. Setting this to nil will allow maintaining
completely separated task buckets, while still sharing the same
resources pool."
:group 'org-export-taskjuggler
:type 'boolean)
;;; Hooks ;;; Hooks
(defvar org-export-taskjuggler-final-hook nil (defvar org-export-taskjuggler-final-hook nil
@ -350,7 +358,10 @@ defined in `org-export-taskjuggler-default-reports'."
(org-clone-local-variables old-buffer "^org-") (org-clone-local-variables old-buffer "^org-")
(insert org-export-taskjuggler-default-global-header) (insert org-export-taskjuggler-default-global-header)
(org-taskjuggler-open-project (car tasks)) (org-taskjuggler-open-project
(if org-export-taskjuggler-keep-project-as-task
(car tasks)
(pop tasks)))
(insert org-export-taskjuggler-default-global-properties) (insert org-export-taskjuggler-default-global-properties)
(insert "\n") (insert "\n")
(dolist (resource resources) (dolist (resource resources)
@ -365,7 +376,9 @@ defined in `org-export-taskjuggler-default-reports'."
(org-taskjuggler-close-maybe level) (org-taskjuggler-close-maybe level)
(org-taskjuggler-open-task task) (org-taskjuggler-open-task task)
(setq org-export-taskjuggler-old-level level))) (setq org-export-taskjuggler-old-level level)))
(org-taskjuggler-close-maybe 1) (org-taskjuggler-close-maybe
(if org-export-taskjuggler-keep-project-as-task
1 2))
(org-taskjuggler-insert-reports) (org-taskjuggler-insert-reports)
(save-buffer) (save-buffer)
(or (org-export-push-to-kill-ring "TaskJuggler") (or (org-export-push-to-kill-ring "TaskJuggler")
@ -446,7 +459,11 @@ a path to the current task."
(push unique-id (car unique-ids)) (push unique-id (car unique-ids))
(setcar path unique-id))) (setcar path unique-id)))
(push (cons "unique-id" unique-id) task) (push (cons "unique-id" unique-id) task)
(push (cons "path" (mapconcat 'identity (reverse path) ".")) task) (push (cons "path"
(mapconcat 'identity
(if org-export-taskjuggler-keep-project-as-task
(reverse path)
(cdr (reverse path))) ".")) task)
(setq previous-level level) (setq previous-level level)
(setq resolved-tasks (append resolved-tasks (list task))))))) (setq resolved-tasks (append resolved-tasks (list task)))))))