contrapunctus
/
chronometrist
Archived
1
3
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

feat(details): implement timestamp ranges

This commit is contained in:
contrapunctus 2021-07-03 10:51:36 +05:30
parent 7976b53d91
commit 26e3dd5c5d
2 changed files with 36 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
elisp/chronometrist.el
View File

@ -2146,16 +2146,30 @@ TABLE must be a hash table similar to `chronometrist-events'."
((pred stringp)
(gethash range table))
(`(,begin . ,end)
(if (and (chronometrist-iso-date-p begin) (chronometrist-iso-date-p end))
(let ((begin-ts (chronometrist-iso-timestamp-to-ts begin))
(end-ts (chronometrist-iso-timestamp-to-ts end)))
;; `chronometrist-iso-timestamp-to-ts' also accepts ISO dates
(let ((begin-ts (chronometrist-iso-timestamp-to-ts begin))
(end-ts (chronometrist-iso-timestamp-to-ts end)))
(if (and (chronometrist-iso-date-p begin) (chronometrist-iso-date-p end))
(cl-loop while (not (ts> begin-ts end-ts))
append (gethash (ts-format "%F" begin-ts) table)
do (ts-adjustf begin-ts 'day 1)))))))
do (ts-adjustf begin-ts 'day 1))
(cl-loop while (not (ts> begin-ts end-ts))
append
(cl-loop for plist in (gethash (ts-format "%F" begin-ts) table)
when
(let ((start-ts (chronometrist-iso-timestamp-to-ts
(plist-get plist :start)))
(stop-ts (chronometrist-iso-timestamp-to-ts
(plist-get plist :stop))))
(and (ts>= start-ts begin-ts)
(ts<= stop-ts end-ts)))
collect plist)
do (ts-adjustf begin-ts 'day 1)))))))
;; (chronometrist-details-intervals-for-range nil chronometrist-events)
;; (chronometrist-details-intervals-for-range "2021-06-01" chronometrist-events)
;; (chronometrist-details-intervals-for-range '("2021-06-01" . "2021-06-03") chronometrist-events)
;; (chronometrist-details-intervals-for-range '("2021-06-02T01:00+05:30" . "2021-06-02T03:00+05:30") chronometrist-events)
(defun chronometrist-details-set-range ()
"Prompt user for range for current `chronometrist-details' buffer."

22
elisp/chronometrist.org
View File

@ -3398,16 +3398,30 @@ TABLE must be a hash table similar to `chronometrist-events'."
((pred stringp)
(gethash range table))
(`(,begin . ,end)
(if (and (chronometrist-iso-date-p begin) (chronometrist-iso-date-p end))
(let ((begin-ts (chronometrist-iso-timestamp-to-ts begin))
(end-ts (chronometrist-iso-timestamp-to-ts end)))
;; `chronometrist-iso-timestamp-to-ts' also accepts ISO dates
(let ((begin-ts (chronometrist-iso-timestamp-to-ts begin))
(end-ts (chronometrist-iso-timestamp-to-ts end)))
(if (and (chronometrist-iso-date-p begin) (chronometrist-iso-date-p end))
(cl-loop while (not (ts> begin-ts end-ts))
append (gethash (ts-format "%F" begin-ts) table)
do (ts-adjustf begin-ts 'day 1)))))))
do (ts-adjustf begin-ts 'day 1))
(cl-loop while (not (ts> begin-ts end-ts))
append
(cl-loop for plist in (gethash (ts-format "%F" begin-ts) table)
when
(let ((start-ts (chronometrist-iso-timestamp-to-ts
(plist-get plist :start)))
(stop-ts (chronometrist-iso-timestamp-to-ts
(plist-get plist :stop))))
(and (ts>= start-ts begin-ts)
(ts<= stop-ts end-ts)))
collect plist)
do (ts-adjustf begin-ts 'day 1)))))))
;; (chronometrist-details-intervals-for-range nil chronometrist-events)
;; (chronometrist-details-intervals-for-range "2021-06-01" chronometrist-events)
;; (chronometrist-details-intervals-for-range '("2021-06-01" . "2021-06-03") chronometrist-events)
;; (chronometrist-details-intervals-for-range '("2021-06-02T01:00+05:30" . "2021-06-02T03:00+05:30") chronometrist-events)
#+END_SRC
**** set-range :command:writer: