From: Yann Hodique <yann.hodique@gmail.com>
To: emacs-orgmode@gnu.org
Cc: Yann Hodique <yann.hodique@gmail.com>
Subject: [PATCH v2 09/11] org-taskjuggler: allow reports definition from within the org file
Date: Wed, 15 Aug 2012 21:11:55 +0200 [thread overview]
Message-ID: <1345057917-69300-11-git-send-email-yann.hodique@gmail.com> (raw)
In-Reply-To: <1345057917-69300-1-git-send-email-yann.hodique@gmail.com>
In-Reply-To: <1344164044-15059-1-git-send-email-yann.hodique@gmail.com>
* org-taskjuggler.el (org-export-taskjuggler-report-tag): new custom variable
(org-export-taskjuggler-valid-report-attributes): new custom variable
(org-export-as-taskjuggler): compute reports
(org-taskjuggler-open-report): generate report from org item
(org-taskjuggler-insert-reports): insert default reports only if no explicit
one is defined
---
lisp/org-taskjuggler.el | 42 +++++++++++++++++++++++++++++++++++++-----
1 file changed, 37 insertions(+), 5 deletions(-)
diff --git a/lisp/org-taskjuggler.el b/lisp/org-taskjuggler.el
index 33b111d..49c24ff 100644
--- a/lisp/org-taskjuggler.el
+++ b/lisp/org-taskjuggler.el
@@ -181,6 +181,13 @@ resources for the project."
:version "24.1"
:type 'string)
+(defcustom org-export-taskjuggler-report-tag "taskjuggler_report"
+ "Tag, property or todo used to find the tree containing all the
+reports for the project."
+ :group 'org-export-taskjuggler
+ :version "24.1"
+ :type 'string)
+
(defcustom org-export-taskjuggler-target-version 2.4
"Which version of TaskJuggler the exporter is targeting."
:group 'org-export-taskjuggler
@@ -264,6 +271,14 @@ but before any resource and task declarations."
the corresponding resource."
:group 'org-export-taskjuggler)
+(defcustom org-export-taskjuggler-valid-report-attributes
+ '(headline columns definitions timeformat hideresource hidetask
+ loadunit sorttasks formats period)
+ "Valid attributes for Taskjuggler reports. If one of these
+ appears as a property for a headline, it will be exported with
+ the corresponding report."
+ :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
@@ -314,6 +329,10 @@ defined in `org-export-taskjuggler-default-reports'."
(org-map-entries
'org-taskjuggler-components
org-export-taskjuggler-resource-tag nil 'archive 'comment)))
+ (reports
+ (org-map-entries
+ 'org-taskjuggler-components
+ org-export-taskjuggler-report-tag nil 'archive 'comment))
(filename (expand-file-name
(concat
(file-name-sans-extension
@@ -379,7 +398,7 @@ defined in `org-export-taskjuggler-default-reports'."
(org-taskjuggler-close-maybe
(if org-export-taskjuggler-keep-project-as-task
1 2))
- (org-taskjuggler-insert-reports)
+ (org-taskjuggler-insert-reports reports)
(save-buffer)
(or (org-export-push-to-kill-ring "TaskJuggler")
(message "Exporting... done"))
@@ -741,6 +760,16 @@ org-mode priority string."
(org-taskjuggler-get-attributes task attributes)
"\n"))))
+(defun org-taskjuggler-open-report (report)
+ (let* ((kind (or (cdr (assoc "report-kind" report)) "taskreport"))
+ (headline (cdr (assoc "HEADLINE" report)))
+ (attributes org-export-taskjuggler-valid-report-attributes))
+ (insert
+ (concat
+ kind " \"" headline "\" {\n"
+ (org-taskjuggler-get-attributes report attributes)
+ "\n}\n"))))
+
(defun org-taskjuggler-close-maybe (level)
(while (> org-export-taskjuggler-old-level level)
(insert "}\n")
@@ -748,10 +777,13 @@ org-mode priority string."
(when (= org-export-taskjuggler-old-level level)
(insert "}\n")))
-(defun org-taskjuggler-insert-reports ()
- (let (report)
- (dolist (report org-export-taskjuggler-default-reports)
- (insert report "\n"))))
+(defun org-taskjuggler-insert-reports (reports)
+ (if reports
+ (dolist (report (cdr reports))
+ (org-taskjuggler-open-report report))
+ (let (report)
+ (dolist (report org-export-taskjuggler-default-reports)
+ (insert report "\n")))))
(provide 'org-taskjuggler)
--
1.7.11.4
next prev parent reply other threads:[~2012-08-15 19:12 UTC|newest]
Thread overview: 51+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-08-05 10:53 [PATCH 00/10] Takjuggler exporter improvements Yann Hodique
2012-08-05 10:53 ` [PATCH 01/10] org-taskjuggler: make task and resource properties customizable Yann Hodique
2012-08-05 10:53 ` [PATCH 02/10] org-taskjuggler: properly install local variables at export time Yann Hodique
2012-08-05 10:53 ` [PATCH 03/10] org-taskjuggler: make use of org properties Yann Hodique
2012-08-05 10:53 ` [PATCH 04/10] org-taskjuggler: task with end-only is also a milestone (deadline) Yann Hodique
2012-08-05 10:53 ` [PATCH 05/10] org-taskjuggler: introduce a global header, for early macros Yann Hodique
2012-08-05 10:54 ` [PATCH 06/10] org-taskjuggler: use project end date, if specified Yann Hodique
2012-08-05 10:54 ` [PATCH 07/10] org-taskjuggler: make project umbrella task optional Yann Hodique
2012-08-10 5:30 ` Christian Egli
2012-08-12 8:03 ` Yann Hodique
2012-08-12 21:36 ` Simon Thum
2012-08-12 21:56 ` Bastien
2012-08-14 2:39 ` Christian Egli
2012-08-14 7:43 ` Bastien
2012-08-05 10:54 ` [PATCH 08/10] org-taskjuggler: disambiguate "headline", as it's also a valid taskjuggler property Yann Hodique
2012-08-05 10:54 ` [PATCH 09/10] org-taskjuggler: allow reports definition from within the org file Yann Hodique
2012-08-05 10:54 ` [PATCH 10/10] org-taskjuggler: update doc to reflect latest changes Yann Hodique
2012-08-05 17:29 ` [PATCH 00/10] Takjuggler exporter improvements Bastien
2012-08-05 20:02 ` Yann Hodique
2012-08-06 8:15 ` Bastien
2012-08-10 5:25 ` Christian Egli
2012-08-15 19:11 ` [PATCH v2 00/11] " Yann Hodique
2012-08-15 19:11 ` [PATCH 04/10] org-taskjuggler: task with end-only is also a milestone (deadline) Yann Hodique
2012-08-16 7:48 ` [PATCH v2 00/11] Takjuggler exporter improvements Bastien
2012-08-16 18:37 ` Yann Hodique
2012-08-19 7:27 ` Bastien
2012-08-16 19:01 ` [PATCH v3 00/11] Taskjuggler " Yann Hodique
2012-08-16 19:01 ` [PATCH v3 01/11] org-taskjuggler.el: Make task and resource properties customizable Yann Hodique
2012-08-16 19:02 ` [PATCH v3 02/11] org-taskjuggler.el: Properly install local variables at export time Yann Hodique
2012-08-16 19:02 ` [PATCH v3 03/11] org-taskjuggler.el: Make use of org properties Yann Hodique
2012-08-16 19:02 ` [PATCH v3 04/11] org-taskjuggler.el: Fix milestone definition Yann Hodique
2012-08-16 19:02 ` [PATCH v3 05/11] org-taskjuggler.el: Introduce a global header, for early macros Yann Hodique
2012-08-16 19:02 ` [PATCH v3 06/11] org-taskjuggler.el: Use project end date, if specified Yann Hodique
2012-08-16 19:02 ` [PATCH v3 07/11] org-taskjuggler.el: Make project umbrella task optional Yann Hodique
2012-08-16 19:02 ` [PATCH v3 08/11] org-taskjuggler.el: Disambiguate "headline", as it's a valid attribute Yann Hodique
2012-08-16 19:02 ` [PATCH v3 09/11] org-taskjuggler.el: Allow reports definition from within the org file Yann Hodique
2012-08-16 19:02 ` [PATCH v3 10/11] org-taskjuggler.el: Update doc to reflect latest changes Yann Hodique
2012-08-16 19:02 ` [PATCH v3 11/11] org-taskjuggler.el: Make taskjuggler compatible with org-publish Yann Hodique
2012-08-26 7:55 ` [PATCH v3 00/11] Taskjuggler exporter improvements Bastien
2012-09-25 13:53 ` Christian Egli
2012-08-15 19:11 ` [PATCH v2 01/11] org-taskjuggler: make task and resource properties customizable Yann Hodique
2012-08-15 19:11 ` [PATCH v2 02/11] org-taskjuggler: properly install local variables at export time Yann Hodique
2012-08-15 19:11 ` [PATCH v2 03/11] org-taskjuggler: make use of org properties Yann Hodique
2012-08-15 19:11 ` [PATCH v2 04/11] org-taskjuggler: fix milestone definition Yann Hodique
2012-08-15 19:11 ` [PATCH v2 05/11] org-taskjuggler: introduce a global header, for early macros Yann Hodique
2012-08-15 19:11 ` [PATCH v2 06/11] org-taskjuggler: use project end date, if specified Yann Hodique
2012-08-15 19:11 ` [PATCH v2 07/11] org-taskjuggler: make project umbrella task optional Yann Hodique
2012-08-15 19:11 ` [PATCH v2 08/11] org-taskjuggler: disambiguate "headline", as it's also a valid property Yann Hodique
2012-08-15 19:11 ` Yann Hodique [this message]
2012-08-15 19:11 ` [PATCH v2 10/11] org-taskjuggler: update doc to reflect latest changes Yann Hodique
2012-08-15 19:11 ` [PATCH v2 11/11] org-taskjuggler: make taskjuggler compatible with org-publish Yann Hodique
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://www.orgmode.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1345057917-69300-11-git-send-email-yann.hodique@gmail.com \
--to=yann.hodique@gmail.com \
--cc=emacs-orgmode@gnu.org \
--subject='Re: [PATCH v2 09/11] org-taskjuggler: allow reports definition from within the org file' \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Code repositories for project(s) associated with this inbox:
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).