I've attached a patch on top of my first patch, containing tests. On Mon, May 7, 2018 at 1:38 PM Nicolas Goaziou <m...@nicolasgoaziou.fr> wrote: > > Hello, > > Robert Irelan <rire...@gmail.com> writes: > > > I've rebased against latest master and attached the patch. > > It looks good, thank you. > > Would you mind proving a couple of regression tests, e.g., in > "test-org-clock.el"? > > Regards, > > -- > Nicolas Goaziou
-- Robert Irelan rire...@gmail.com
From a7b1a3163d36a7d715abcce096c60ec50bb40658 Mon Sep 17 00:00:00 2001 From: Robert Irelan <rmire...@google.com> Date: Tue, 26 Jun 2018 18:33:39 -0700 Subject: [PATCH 2/2] Add tests for clocktable behavior under org-extend-today-until --- testing/lisp/test-org-clock.el | 50 ++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) diff --git a/testing/lisp/test-org-clock.el b/testing/lisp/test-org-clock.el index e85325c14..abb3637bd 100644 --- a/testing/lisp/test-org-clock.el +++ b/testing/lisp/test-org-clock.el @@ -979,5 +979,55 @@ CLOCK: [2017-12-27 Wed 08:00]--[2017-12-27 Wed 16:00] => 8:00" (concat ":step day :tstart \"<2017-12-25 Mon>\" " ":tend \"<2017-12-27 Wed 23:59>\" :stepskip0 t"))))))) +(ert-deftest test-org-clock/clocktable/extend-today-until () + "Test assignment of clock time to days in presence of \"org-extend-today-until\"." + ;; Basic test of :block with org-extend-today-until - the report for + ;; 2017-09-30 should include the time clocked on 2017-10-01 before + ;; 04:00. + (should + (equal "| Headline | Time | +|--------------+--------| +| *Total time* | *2:00* | +|--------------+--------| +| Foo | 2:00 |" + (org-test-with-temp-text + "* Foo +CLOCK: [2017-09-30 Sat 12:00]--[2017-09-30 Sat 13:00] => 1:00 +CLOCK: [2017-10-01 Sun 02:00]--[2017-10-01 Sun 03:00] => 1:00 +CLOCK: [2017-10-01 Sun 11:00]--[2017-10-01 Sun 13:00] => 2:00" + (setq-local org-extend-today-until 4) + (let ((system-time-locale "en_US")) + (test-org-clock-clocktable-contents + ":block 2017-09-30"))))) + + ;; Week-length block - time on Monday before 04:00 should be + ;; assigned to previous week. + (should + (equal " +Weekly report starting on: [2017-10-01 Sun] +| Headline | Time | +|--------------+--------| +| *Total time* | *2:00* | +|--------------+--------| +| Foo | 2:00 | + +Weekly report starting on: [2017-10-02 Mon] +| Headline | Time | +|--------------+--------| +| *Total time* | *2:00* | +|--------------+--------| +| Foo | 2:00 | +" + (org-test-with-temp-text + "* Foo +CLOCK: [2017-10-01 Sun 12:00]--[2017-10-01 Sun 13:00] => 1:00 +CLOCK: [2017-10-02 Mon 02:00]--[2017-10-02 Mon 03:00] => 1:00 +CLOCK: [2017-10-02 Mon 11:00]--[2017-10-02 Mon 13:00] => 2:00" + (setq-local org-extend-today-until 4) + (let ((system-time-locale "en_US")) + (test-org-clock-clocktable-contents + ":step week :block 2017-10 :stepskip0 t")))))) + + (provide 'test-org-clock) ;;; test-org-clock.el end here -- 2.18.0.rc2.346.g013aa6912e-goog
From dceba0d0964bce75cf78246f33becd0fbe543b7d Mon Sep 17 00:00:00 2001 From: Robert Irelan <rmire...@google.com> Date: Mon, 30 Apr 2018 17:18:16 -0700 Subject: [PATCH 1/2] Make org-extend-today-until work for clocktable block org-clock: Properly handle `org-extend-today-until' in clock tables * lisp/org-clock.el (org-clock-special-range): Handle non-default `org-extend-today-until' when generating a clock table with the `:block` directive. Reported-by: Robert Irelan <rire...@gmail.com> <http://lists.gnu.org/archive/html/emacs-orgmode/2018-04/msg00294.html> --- lisp/org-clock.el | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/lisp/org-clock.el b/lisp/org-clock.el index b769a4fed..f2562fb6d 100644 --- a/lisp/org-clock.el +++ b/lisp/org-clock.el @@ -2200,13 +2200,17 @@ have priority." (`lastq (setq key 'quarter shift -1)))) ;; Prepare start and end times depending on KEY's type. (pcase key - ((or `day `today) (setq m 0 h 0 h1 24 d (+ d shift))) + ((or `day `today) (setq m 0 + h org-extend-today-until + h1 (+ 24 org-extend-today-until) + d (+ d shift))) ((or `week `thisweek) (let* ((ws (or wstart 1)) (diff (+ (* -7 shift) (if (= dow 0) (- 7 ws) (- dow ws))))) - (setq m 0 h 0 d (- d diff) d1 (+ 7 d)))) + (setq m 0 h org-extend-today-until d (- d diff) d1 (+ 7 d)))) ((or `month `thismonth) - (setq h 0 m 0 d (or mstart 1) month (+ month shift) month1 (1+ month))) + (setq h org-extend-today-until m 0 d (or mstart 1) + month (+ month shift) month1 (1+ month))) ((or `quarter `thisq) ;; Compute if this shift remains in this year. If not, compute ;; how many years and quarters we have to shift (via floor*) and @@ -2224,14 +2228,16 @@ have priority." (setq shiftedy (- y (+ 1 (nth 0 tmp))) shiftedm (- 13 (* 3 (nth 1 tmp))) shiftedq (- 5 (nth 1 tmp))))) - (setq m 0 h 0 d 1 month shiftedm month1 (+ 3 shiftedm) y shiftedy)) + (setq m 0 h org-extend-today-until d 1 + month shiftedm month1 (+ 3 shiftedm) y shiftedy)) ((> (+ q shift) 0) ; Shift is within this year. (setq shiftedq (+ q shift)) (setq shiftedy y) (let ((qshift (* 3 (1- (+ q shift))))) - (setq m 0 h 0 d 1 month (+ 1 qshift) month1 (+ 4 qshift)))))) + (setq m 0 h org-extend-today-until d 1 + month (+ 1 qshift) month1 (+ 4 qshift)))))) ((or `year `thisyear) - (setq m 0 h 0 d 1 month 1 y (+ y shift) y1 (1+ y))) + (setq m 0 h org-extend-today-until d 1 month 1 y (+ y shift) y1 (1+ y))) ((or `interactive `untilnow)) ; Special cases, ignore them. (_ (user-error "No such time block %s" key))) ;; Format start and end times according to AS-STRINGS. -- 2.18.0.rc2.346.g013aa6912e-goog
