* [PATCH] org-taskjuggler.el - add valid project attributes
@ 2014-06-25 15:26 Thorsten Jolitz
2014-07-27 15:03 ` Bastien
0 siblings, 1 reply; 2+ messages in thread
From: Thorsten Jolitz @ 2014-06-25 15:26 UTC (permalink / raw)
To: emacs-orgmode
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Taskjuggler Patch --]
[-- Type: text/x-patch, Size: 4403 bytes --]
From bc21dacd0bb400c5bb92acff9bbf2d00560f1c92 Mon Sep 17 00:00:00 2001
From: tj <tj@data-driven.de>
Date: Wed, 25 Jun 2014 16:27:42 +0200
Subject: [PATCH] Taskjuggler: Add valid project attributes
* ox-taskjuggler.el (org-taskjuggler--build-project): Insert all
valid attributes from project.
* ox-taskjuggler.el (org-taskjuggler--build-attributes): Add project
as possible ITEM to docstring.
* ox-taskjuggler.el (org-taskjuggler-valid-project-attributes): New
defcustom.
As reported by Nick Garber, project attributes like 'timingresolution'
could not be changed via Org-mode properties. This patch makes the
exporter treat project-attributes just like it treats task-, resource-
and report-attributes.
---
contrib/lisp/ox-taskjuggler.el | 52 ++++++++++++++++++++++++++++++------------
1 file changed, 37 insertions(+), 15 deletions(-)
diff --git a/contrib/lisp/ox-taskjuggler.el b/contrib/lisp/ox-taskjuggler.el
index 761e180..b3a691a 100644
--- a/contrib/lisp/ox-taskjuggler.el
+++ b/contrib/lisp/ox-taskjuggler.el
@@ -310,6 +310,19 @@ If one of these appears as a property for a headline, it will be
exported with the corresponding task."
:group 'org-export-taskjuggler)
+(defcustom org-taskjuggler-valid-project-attributes
+ '(timingresolution timezone alertlevels currency currencyformat
+ dailyworkinghours extend includejournalentry now numberformat
+ outputdir scenario shorttimeformat timeformat trackingscenario
+ weekstartsmonday weekstartssunday workinghours
+ yearlyworkingdays)
+ "Valid attributes for Taskjuggler project.
+If one of these appears as a property for a headline that is a
+project definition, it will be exported with the corresponding
+task. Attribute 'timingresolution' should be the first in the
+list."
+ :group 'org-export-taskjuggler)
+
(defcustom org-taskjuggler-valid-resource-attributes
'(limits vacation shift booking efficiency journalentry rate
workinghours flags)
@@ -483,9 +496,9 @@ Return new string. If S is the empty string, return it."
(if (equal "" s) s (replace-regexp-in-string "^ *\\S-" " \\&" s)))
(defun org-taskjuggler--build-attributes (item attributes)
- "Return attributes string for task, resource or report ITEM.
-ITEM is a headline. ATTRIBUTES is a list of symbols
-representing valid attributes for ITEM."
+ "Return attributes string for ITEM.
+ITEM is a project, task, resource or report headline. ATTRIBUTES
+is a list of symbols representing valid attributes for ITEM."
(mapconcat
(lambda (attribute)
(let ((value (org-element-property
@@ -715,18 +728,27 @@ PROJECT is a headline. INFO is a plist used as a communication
channel. If no start date is specified, start today. If no end
date is specified, end `org-taskjuggler-default-project-duration'
days from now."
- (format "project %s \"%s\" \"%s\" %s %s {\n}\n"
- (org-taskjuggler-get-id project info)
- (org-taskjuggler-get-name project)
- ;; Version is obtained through :TASKJUGGLER_VERSION:
- ;; property or `org-taskjuggler-default-project-version'.
- (or (org-element-property :VERSION project)
- org-taskjuggler-default-project-version)
- (or (org-taskjuggler-get-start project)
- (format-time-string "%Y-%m-%d"))
- (let ((end (org-taskjuggler-get-end project)))
- (or (and end (format "- %s" end))
- (format "+%sd" org-taskjuggler-default-project-duration)))))
+ (concat
+ ;; Opening project.
+ (format "project %s \"%s\" \"%s\" %s %s {\n"
+ (org-taskjuggler-get-id project info)
+ (org-taskjuggler-get-name project)
+ ;; Version is obtained through :TASKJUGGLER_VERSION:
+ ;; property or `org-taskjuggler-default-project-version'.
+ (or (org-element-property :VERSION project)
+ org-taskjuggler-default-project-version)
+ (or (org-taskjuggler-get-start project)
+ (format-time-string "%Y-%m-%d"))
+ (let ((end (org-taskjuggler-get-end project)))
+ (or (and end (format "- %s" end))
+ (format "+%sd"
+ org-taskjuggler-default-project-duration))))
+ ;; Add attributes.
+ (org-taskjuggler--indent-string
+ (org-taskjuggler--build-attributes
+ project org-taskjuggler-valid-project-attributes))
+ ;; Closing project.
+ "}\n"))
(defun org-taskjuggler--build-resource (resource info)
"Return a resource declaration.
--
2.0.0
[-- Attachment #2: Type: text/plain, Size: 23 bytes --]
--
cheers,
Thorsten
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] org-taskjuggler.el - add valid project attributes
2014-06-25 15:26 [PATCH] org-taskjuggler.el - add valid project attributes Thorsten Jolitz
@ 2014-07-27 15:03 ` Bastien
0 siblings, 0 replies; 2+ messages in thread
From: Bastien @ 2014-07-27 15:03 UTC (permalink / raw)
To: Thorsten Jolitz; +Cc: emacs-orgmode
Hi Thorsten,
Thorsten Jolitz <tjolitz@gmail.com> writes:
> From bc21dacd0bb400c5bb92acff9bbf2d00560f1c92 Mon Sep 17 00:00:00 2001
> From: tj <tj@data-driven.de>
> Date: Wed, 25 Jun 2014 16:27:42 +0200
> Subject: [PATCH] Taskjuggler: Add valid project attributes
Applied, thanks.
--
Bastien
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2014-07-28 17:25 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-06-25 15:26 [PATCH] org-taskjuggler.el - add valid project attributes Thorsten Jolitz
2014-07-27 15:03 ` Bastien
Code repositories for project(s) associated with this public 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).