From dc7ebb4286d63a866b59f3b74ca00245cb0011a0 Mon Sep 17 00:00:00 2001
From: Nikolay Puzanov <punzik@gmail.com>
Date: Thu, 22 May 2014 11:49:39 +0400
Subject: [PATCH] Add deadline to default output

---
 worktimer.scm | 24 ++++++++++++++++++++----
 1 file changed, 20 insertions(+), 4 deletions(-)

diff --git a/worktimer.scm b/worktimer.scm
index 255ee60..65dae02 100755
--- a/worktimer.scm
+++ b/worktimer.scm
@@ -689,10 +689,26 @@
           ;; Show running task
           (let ((last (last-task sheet)))
             (if (and last (not (caddr last)))
-                (format #t "~a: ~a\n"
-                        (path->string (car last))
-                        (time->string
-                         (date-difference (current-date) (cadr last))))
+                (let* ((path (car last))
+                       (timer (date-difference (current-date) (cadr last))))
+                  (format #t "~a: ~a ~a\n"
+                          (path->string path)
+                          (time->string timer)
+                          ;; Print deadline
+                          (let ((deadline (find-by-path deadlines path)))
+                            (if (and deadline (cadr deadline))
+                                (let ((deadtime (cadr deadline)))
+                                  (string-append
+                                   "(" (if (or (and (date? deadtime)
+                                                    (date<? (date-round-day deadtime)
+                                                            (date-round-day (current-date))))
+                                               (and (time? deadtime)
+                                                    (time<? deadtime timer)))
+                                           "expired"
+                                           (date/time->string deadtime))
+                                   ")"))
+                                ""))))
+                
                 (format #t "NO TASKS\n")))
 
           ;; Else run command