jiri/org-ql
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge: 0.3.2

Browse source
This commit is contained in:
Adam Porter 2019-10-19 01:11:07 -05:00
commit 80b8bada7b
3 changed files with 22 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
README.org
View file

@ -388,6 +388,12 @@ Expands into a call to ~org-ql-select~ with the same arguments. For convenience
*Internal* *Internal*
+ Added generic node data cache to speed up recursive, tree-based queries. + Added generic node data cache to speed up recursive, tree-based queries.
** 0.3.2
*Fixed*
+ In =org-ql-search=, accept symbol as ~:super-groups~ argument.
+ In the =This week= and =Next week= default =org-ql-views= views, set timestamps for beginning-of-week to 00:00:00 and end-of-week to 23:59:59.
** 0.3.1 ** 0.3.1
*Fixed* *Fixed*

4
org-ql-search.el
View file

@ -212,7 +212,9 @@ necessary."
(org-ql-view-super-groups super-groups) (org-ql-view-super-groups super-groups)
(org-ql-view-title title)) (org-ql-view-title title))
(when super-groups (when super-groups
(let ((org-super-agenda-groups super-groups)) (let ((org-super-agenda-groups (cl-etypecase super-groups
(symbol (symbol-value super-groups))
(list super-groups))))
(setf strings (org-super-agenda--group-items strings)))) (setf strings (org-super-agenda--group-items strings))))
(org-ql-view--display :buffer buffer :header header (org-ql-view--display :buffer buffer :header header
:string (s-join "\n" strings))))) :string (s-join "\n" strings)))))

17
org-ql-view.el
View file

@ -147,8 +147,13 @@ See info node `(elisp)Cyclic Window Ordering'."
(cons "This week" (lambda () (cons "This week" (lambda ()
"Show items with an active timestamp during this calendar week." "Show items with an active timestamp during this calendar week."
(interactive) (interactive)
(let* ((beg-of-week (ts-adjust 'day (- (ts-dow (ts-now))) (ts-now))) (let* ((ts (ts-now))
(end-of-week (ts-adjust 'day (- 6 (ts-dow (ts-now))) (ts-now)))) (beg-of-week (->> ts
(ts-adjust 'day (- (ts-dow (ts-now))))
(ts-apply :hour 0 :minute 0 :second 0)))
(end-of-week (->> ts
(ts-adjust 'day (- 6 (ts-dow (ts-now))))
(ts-apply :hour 23 :minute 59 :second 59))))
(org-ql-search (org-agenda-files) (org-ql-search (org-agenda-files)
`(ts-active :from ,beg-of-week `(ts-active :from ,beg-of-week
:to ,end-of-week) :to ,end-of-week)
@ -159,8 +164,12 @@ See info node `(elisp)Cyclic Window Ordering'."
"Show items with an active timestamp during the next calendar week." "Show items with an active timestamp during the next calendar week."
(interactive) (interactive)
(let* ((ts (ts-adjust 'day 7 (ts-now))) (let* ((ts (ts-adjust 'day 7 (ts-now)))
(beg-of-week (ts-adjust 'day (- (ts-dow (ts-now))) ts)) (beg-of-week (->> ts
(end-of-week (ts-adjust 'day (- 6 (ts-dow (ts-now))) ts))) (ts-adjust 'day (- (ts-dow (ts-now))))
(ts-apply :hour 0 :minute 0 :second 0)))
(end-of-week (->> ts
(ts-adjust 'day (- 6 (ts-dow (ts-now))))
(ts-apply :hour 23 :minute 59 :second 59))))
(org-ql-search (org-agenda-files) (org-ql-search (org-agenda-files)
`(ts-active :from ,beg-of-week `(ts-active :from ,beg-of-week
:to ,end-of-week) :to ,end-of-week)