From mboxrd@z Thu Jan 1 00:00:00 1970 From: Baptiste Subject: ox-taskjuggler : Correct a small typo and deal with Scheduled and deadline in task Date: Fri, 19 Apr 2013 18:55:04 +0200 Message-ID: <874nf24g0n.fsf@bat.fr.eu.org> Mime-Version: 1.0 Content-Type: text/plain Return-path: Received: from eggs.gnu.org ([208.118.235.92]:60321) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UTDef-0001uz-Gd for emacs-orgmode@gnu.org; Fri, 19 Apr 2013 11:55:20 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UTDec-00028y-SD for emacs-orgmode@gnu.org; Fri, 19 Apr 2013 11:55:17 -0400 Received: from mail-ea0-x230.google.com ([2a00:1450:4013:c01::230]:51983) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UTDec-00028m-Ji for emacs-orgmode@gnu.org; Fri, 19 Apr 2013 11:55:14 -0400 Received: by mail-ea0-f176.google.com with SMTP id h14so1225129eak.21 for ; Fri, 19 Apr 2013 08:55:13 -0700 (PDT) List-Id: "General discussions about Org-mode." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org Sender: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org To: Org-mode Hi, hereafter a small typo correction, plus the capability to use DEADLINE: and SCHEDULED: in task (special export format for milestones). -- : ~^v^~ Bat ox-taskjuggler : Correct a small typo and deal with Scheduled and deadline in task diff --git a/contrib/lisp/ox-taskjuggler.el b/contrib/lisp/ox-taskjuggler.el index 16f0e8d..113aa29 100644 --- a/contrib/lisp/ox-taskjuggler.el +++ b/contrib/lisp/ox-taskjuggler.el @@ -754,16 +754,18 @@ a unique id will be associated to it." (org-element-property :COMPLETE task))) (depends (org-taskjuggler-resolve-dependencies task info)) (effort (org-element-property :EFFORT task)) + (start (org-taskjuggler-get-start task)) + (end (org-taskjuggler-get-end task)) (milestone (or (org-element-property :MILESTONE task) (not (or (org-element-map (org-element-contents task) 'headline @@ -775,6 +777,14 @@ a unique id will be associated to it." (org-taskjuggler-get-id task info) (org-taskjuggler-get-name task)) ;; Add default attributes. + (and milestone + (cond + ((and start end) (format " start %s\n maxend %s\n" start end)) + ((and start) (format " start %s\n" start)) + ((and end) (format " start %s\n" end)))) + (and start (not milestone) (format " start %s\n" start)) + (and end (not milestone) (format " end %s\n" end)) + (and depends (format " depends %s\n" (org-taskjuggler-format-dependencies depends task info))) @@ -790,7 +800,7 @@ a unique id will be associated to it." (let* ((minutes (org-duration-string-to-minutes effort)) (hours (/ minutes 60.0))) (format "%.1fh" hours)))) - (and priority (format " priority %s\n" complete)) + (and priority (format " priority %s\n" priority)) (and milestone " milestone\n") ;; Add other valid attributes. (org-taskjuggler--indent-string