* Suggested change to round timestamps.
@ 2006-03-13 23:43 Alex Bochannek
2006-03-15 7:23 ` Carsten Dominik
0 siblings, 1 reply; 5+ messages in thread
From: Alex Bochannek @ 2006-03-13 23:43 UTC (permalink / raw)
To: emacs-orgmode
[-- Attachment #1: Type: text/plain, Size: 343 bytes --]
When I first started using Org-mode to keep track of events during the
day, I found the timestamp function extremely handy. I didn't want to
keep time to the minute, but round to, e.g., fifteen minute intervals.
Attached is the patch that I am proposing. Since it was originally
against 4.01, I hope I didn't miss anything important.
Alex.
[-- Attachment #2: Type: text/plain, Size: 7825 bytes --]
*** org.el 13 Mar 2006 15:08:15 -0800 1.8
--- org.el 13 Mar 2006 15:26:19 -0800
***************
*** 433,438 ****
--- 433,444 ----
It is not recommended to change this constant.")
+ (defcustom org-time-stamp-rounding-minutes 0
+ "No. of minutes to round time stamps to upon insertion.
+ When zero, insert the time unmodified."
+ :group 'org-time
+ :type 'integer)
+
(defcustom org-deadline-warning-days 30
"No. of days before expiration during which a deadline becomes active.
This variable governs the display in the org file."
***************
*** 3396,3402 ****
(looking-at org-todo-line-regexp)
(goto-char (or (match-end 2) (match-beginning 3)))
(insert "(" (format-time-string (cdr org-time-stamp-formats)
! (current-time))
")"))
;; Save the buffer, if it is not the same buffer.
(if (not (eq this-buffer buffer)) (save-buffer))))
--- 3402,3409 ----
(looking-at org-todo-line-regexp)
(goto-char (or (match-end 2) (match-beginning 3)))
(insert "(" (format-time-string (cdr org-time-stamp-formats)
! (org-time-stamp-round
! (current-time)))
")"))
;; Save the buffer, if it is not the same buffer.
(if (not (eq this-buffer buffer)) (save-buffer))))
***************
*** 3627,3633 ****
(insert org-closed-string " "
(format-time-string
(concat "[" (substring (cdr org-time-stamp-formats) 1 -1) "]")
! (current-time))
"\n")))))
(defun org-show-todo-tree (arg)
--- 3634,3641 ----
(insert org-closed-string " "
(format-time-string
(concat "[" (substring (cdr org-time-stamp-formats) 1 -1) "]")
! (org-time-stamp-round
! (current-time)))
"\n")))))
(defun org-show-todo-tree (arg)
***************
*** 3993,4008 ****
(org-detatch-overlay org-date-ovl)
(if (string-match
! "^ *\\(\\([0-9]+\\)-\\)?\\([0-1]?[0-9]\\)-\\([0-3]?[0-9]\\)\\([^-0-9]\\|$\\)" ans)
(progn
! (setq year (if (match-end 2)
! (string-to-number (match-string 2 ans))
(string-to-number (format-time-string "%Y")))
! month (string-to-number (match-string 3 ans))
! day (string-to-number (match-string 4 ans)))
(if (< year 100) (setq year (+ 2000 year)))
(setq ans (replace-match (format "%04d-%02d-%02d" year month day)
! t t ans))))
(setq tl (parse-time-string ans)
year (or (nth 5 tl) (string-to-number (format-time-string "%Y")))
month (or (nth 4 tl) (string-to-number (format-time-string "%m")))
--- 4001,4016 ----
(org-detatch-overlay org-date-ovl)
(if (string-match
! "^ *\\(\\(\\([0-9]+\\)-\\)?\\([0-1]?[0-9]\\)-\\([0-3]?[0-9]\\)\\)\\([^-0-9]\\|$\\)" ans)
(progn
! (setq year (if (match-end 3)
! (string-to-number (match-string 3 ans))
(string-to-number (format-time-string "%Y")))
! month (string-to-number (match-string 4 ans))
! day (string-to-number (match-string 5 ans)))
(if (< year 100) (setq year (+ 2000 year)))
(setq ans (replace-match (format "%04d-%02d-%02d" year month day)
! t t ans 1))))
(setq tl (parse-time-string ans)
year (or (nth 5 tl) (string-to-number (format-time-string "%Y")))
month (or (nth 4 tl) (string-to-number (format-time-string "%m")))
***************
*** 4014,4019 ****
--- 4022,4038 ----
(nth 2 tl))
(setq org-time-was-given t))
(if (< year 100) (setq year (+ 2000 year)))
+ (if (or org-time-was-given with-time)
+ (progn
+ (setq tl (decode-time
+ (org-time-stamp-round
+ (encode-time second minute hour day month year))))
+ (setq year (nth 5 tl)
+ month (nth 4 tl)
+ day (nth 3 tl)
+ hour (nth 2 tl)
+ minute (nth 1 tl)
+ second (nth 0 tl))))
(if to-time
(encode-time second minute hour day month year)
(if (or (nth 1 tl) (nth 2 tl))
***************
*** 4174,4179 ****
--- 4193,4218 ----
nil nil nil)
(make-list 9 0)))
+ (defun org-time-stamp-round (arg)
+ "Round a time to the closest `org-time-stamp-rounding-minutes'
+ interval."
+ (when (and
+ (/= 0 org-time-stamp-rounding-minutes)
+ (wholenump org-time-stamp-rounding-minutes))
+ (let* (time rounding diff lower upper)
+ (setq time (float-time arg))
+ (setq rounding (* org-time-stamp-rounding-minutes 60))
+ (setq delta (mod time rounding))
+ (setq lower (* (float (floor time rounding)) rounding))
+ (setq upper (* (float (ceiling time rounding)) rounding))
+ (if (/= 0 delta)
+ (if (< (- delta (/ rounding 2.0)) 0)
+ (list (truncate lower 65536.0)
+ (truncate (mod lower 65536.0)))
+ (list (truncate upper 65536.0)
+ (truncate (mod upper 65536.0))))
+ arg))))
+
(defun org-timestamp-up (&optional arg)
"Increase the date item at the cursor by one.
If the cursor is on the year, change the year. If it is on the month or
***************
*** 7857,7863 ****
-1) ?\ ))
;; We need to add a headline: Use time and first buffer line
(setq lines (cons first lines)
! first (concat "* " (current-time-string)
" (" (remember-buffer-desc) ")")
indent " "))
(if org-adapt-indentation
--- 7896,7905 ----
-1) ?\ ))
;; We need to add a headline: Use time and first buffer line
(setq lines (cons first lines)
! first (concat "* " (format-time-string
! (cdr org-time-stamp-formats)
! (org-time-stamp-round
! (current-time)))
" (" (remember-buffer-desc) ")")
indent " "))
(if org-adapt-indentation
***************
*** 10672,10679 ****
".txt"))
(buffer (find-file-noselect filename))
(levels-open (make-vector org-level-max nil))
! (date (format-time-string "%Y/%m/%d" (current-time)))
! (time (format-time-string "%X" (current-time)))
(author user-full-name)
(title (buffer-name))
(options nil)
--- 10714,10723 ----
".txt"))
(buffer (find-file-noselect filename))
(levels-open (make-vector org-level-max nil))
! (date (format-time-string "%Y/%m/%d" (org-time-stamp-round
! (current-time))))
! (time (format-time-string "%X" (org-time-stamp-round
! (current-time))))
(author user-full-name)
(title (buffer-name))
(options nil)
***************
*** 11012,11019 ****
".html"))
(buffer (find-file-noselect filename))
(levels-open (make-vector org-level-max nil))
! (date (format-time-string "%Y/%m/%d" (current-time)))
! (time (format-time-string "%X" (current-time)))
(author user-full-name)
(title (buffer-name))
(options nil)
--- 11056,11065 ----
".html"))
(buffer (find-file-noselect filename))
(levels-open (make-vector org-level-max nil))
! (date (format-time-string "%Y/%m/%d" (org-time-stamp-round
! (current-time))))
! (time (format-time-string "%X" (org-time-stamp-round
! (current-time))))
(author user-full-name)
(title (buffer-name))
(options nil)
***************
*** 11806,11812 ****
When COMBINE is non nil, add the category to each line."
(let ((re2 (concat "--?-?\\(" org-ts-regexp "\\)"))
(dts (org-ical-ts-to-string
! (format-time-string (cdr org-time-stamp-formats) (current-time))
"DTSTART"))
hd ts ts2 state (inc t) pos scheduledp deadlinep tmp pri)
(save-excursion
--- 11852,11860 ----
When COMBINE is non nil, add the category to each line."
(let ((re2 (concat "--?-?\\(" org-ts-regexp "\\)"))
(dts (org-ical-ts-to-string
! (format-time-string (cdr org-time-stamp-formats)
! (org-time-stamp-round
! (current-time)))
"DTSTART"))
hd ts ts2 state (inc t) pos scheduledp deadlinep tmp pri)
(save-excursion
[-- Attachment #3: Type: text/plain, Size: 149 bytes --]
_______________________________________________
Emacs-orgmode mailing list
Emacs-orgmode@gnu.org
http://lists.gnu.org/mailman/listinfo/emacs-orgmode
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: Suggested change to round timestamps.
2006-03-13 23:43 Alex Bochannek
@ 2006-03-15 7:23 ` Carsten Dominik
0 siblings, 0 replies; 5+ messages in thread
From: Carsten Dominik @ 2006-03-15 7:23 UTC (permalink / raw)
To: emacs-orgmode
Ah, Alex,
yes, thank you for this reminder. Alex did sent me that patch before.
I remember that I did like the idea but did not put it in because there
are more places in the code that dead with time stamps and that would
also have to be modified. So some work would be needed, right now I
don't know how much out of the top of my head.
More people who would find this useful?
- Carsten
On Mar 14, 2006, at 0:43, Alex Bochannek wrote:
> When I first started using Org-mode to keep track of events during the
> day, I found the timestamp function extremely handy. I didn't want to
> keep time to the minute, but round to, e.g., fifteen minute intervals.
>
> Attached is the patch that I am proposing. Since it was originally
> against 4.01, I hope I didn't miss anything important.
>
> Alex.
>
> *** org.el 13 Mar 2006 15:08:15 -0800 1.8
> --- org.el 13 Mar 2006 15:26:19 -0800
> ***************
> *** 433,438 ****
> --- 433,444 ----
> It is not recommended to change this constant.")
>
>
> + (defcustom org-time-stamp-rounding-minutes 0
> + "No. of minutes to round time stamps to upon insertion.
> + When zero, insert the time unmodified."
> + :group 'org-time
> + :type 'integer)
> +
> (defcustom org-deadline-warning-days 30
> "No. of days before expiration during which a deadline becomes
> active.
> This variable governs the display in the org file."
> ***************
> *** 3396,3402 ****
> (looking-at org-todo-line-regexp)
> (goto-char (or (match-end 2) (match-beginning 3)))
> (insert "(" (format-time-string (cdr org-time-stamp-formats)
> ! (current-time))
> ")"))
> ;; Save the buffer, if it is not the same buffer.
> (if (not (eq this-buffer buffer)) (save-buffer))))
> --- 3402,3409 ----
> (looking-at org-todo-line-regexp)
> (goto-char (or (match-end 2) (match-beginning 3)))
> (insert "(" (format-time-string (cdr org-time-stamp-formats)
> ! (org-time-stamp-round
> ! (current-time)))
> ")"))
> ;; Save the buffer, if it is not the same buffer.
> (if (not (eq this-buffer buffer)) (save-buffer))))
> ***************
> *** 3627,3633 ****
> (insert org-closed-string " "
> (format-time-string
> (concat "[" (substring (cdr org-time-stamp-formats) 1 -1) "]")
> ! (current-time))
> "\n")))))
>
> (defun org-show-todo-tree (arg)
> --- 3634,3641 ----
> (insert org-closed-string " "
> (format-time-string
> (concat "[" (substring (cdr org-time-stamp-formats) 1 -1) "]")
> ! (org-time-stamp-round
> ! (current-time)))
> "\n")))))
>
> (defun org-show-todo-tree (arg)
> ***************
> *** 3993,4008 ****
> (org-detatch-overlay org-date-ovl)
>
> (if (string-match
> ! "^
> *\\(\\([0-9]+\\)-\\)?\\([0-1]?[0-9]\\)-\\([0-3]?[0-9]\\)\\([^-0
> -9]\\|$\\)" ans)
> (progn
> ! (setq year (if (match-end 2)
> ! (string-to-number (match-string 2 ans))
> (string-to-number (format-time-string "%Y")))
> ! month (string-to-number (match-string 3 ans))
> ! day (string-to-number (match-string 4 ans)))
> (if (< year 100) (setq year (+ 2000 year)))
> (setq ans (replace-match (format "%04d-%02d-%02d" year month day)
> ! t t ans))))
> (setq tl (parse-time-string ans)
> year (or (nth 5 tl) (string-to-number (format-time-string "%Y")))
> month (or (nth 4 tl) (string-to-number (format-time-string "%m")))
> --- 4001,4016 ----
> (org-detatch-overlay org-date-ovl)
>
> (if (string-match
> ! "^
> *\\(\\(\\([0-9]+\\)-\\)?\\([0-1]?[0-9]\\)-\\([0-3]?[0-9]\\)\\)\\([^-0
> -9]\\|$\\)" ans)
> (progn
> ! (setq year (if (match-end 3)
> ! (string-to-number (match-string 3 ans))
> (string-to-number (format-time-string "%Y")))
> ! month (string-to-number (match-string 4 ans))
> ! day (string-to-number (match-string 5 ans)))
> (if (< year 100) (setq year (+ 2000 year)))
> (setq ans (replace-match (format "%04d-%02d-%02d" year month day)
> ! t t ans 1))))
> (setq tl (parse-time-string ans)
> year (or (nth 5 tl) (string-to-number (format-time-string "%Y")))
> month (or (nth 4 tl) (string-to-number (format-time-string "%m")))
> ***************
> *** 4014,4019 ****
> --- 4022,4038 ----
> (nth 2 tl))
> (setq org-time-was-given t))
> (if (< year 100) (setq year (+ 2000 year)))
> + (if (or org-time-was-given with-time)
> + (progn
> + (setq tl (decode-time
> + (org-time-stamp-round
> + (encode-time second minute hour day month year))))
> + (setq year (nth 5 tl)
> + month (nth 4 tl)
> + day (nth 3 tl)
> + hour (nth 2 tl)
> + minute (nth 1 tl)
> + second (nth 0 tl))))
> (if to-time
> (encode-time second minute hour day month year)
> (if (or (nth 1 tl) (nth 2 tl))
> ***************
> *** 4174,4179 ****
> --- 4193,4218 ----
> nil nil nil)
> (make-list 9 0)))
>
> + (defun org-time-stamp-round (arg)
> + "Round a time to the closest `org-time-stamp-rounding-minutes'
> + interval."
> + (when (and
> + (/= 0 org-time-stamp-rounding-minutes)
> + (wholenump org-time-stamp-rounding-minutes))
> + (let* (time rounding diff lower upper)
> + (setq time (float-time arg))
> + (setq rounding (* org-time-stamp-rounding-minutes 60))
> + (setq delta (mod time rounding))
> + (setq lower (* (float (floor time rounding)) rounding))
> + (setq upper (* (float (ceiling time rounding)) rounding))
> + (if (/= 0 delta)
> + (if (< (- delta (/ rounding 2.0)) 0)
> + (list (truncate lower 65536.0)
> + (truncate (mod lower 65536.0)))
> + (list (truncate upper 65536.0)
> + (truncate (mod upper 65536.0))))
> + arg))))
> +
> (defun org-timestamp-up (&optional arg)
> "Increase the date item at the cursor by one.
> If the cursor is on the year, change the year. If it is on the
> month or
> ***************
> *** 7857,7863 ****
> -1) ?\ ))
> ;; We need to add a headline: Use time and first buffer line
> (setq lines (cons first lines)
> ! first (concat "* " (current-time-string)
> " (" (remember-buffer-desc) ")")
> indent " "))
> (if org-adapt-indentation
> --- 7896,7905 ----
> -1) ?\ ))
> ;; We need to add a headline: Use time and first buffer line
> (setq lines (cons first lines)
> ! first (concat "* " (format-time-string
> ! (cdr org-time-stamp-formats)
> ! (org-time-stamp-round
> ! (current-time)))
> " (" (remember-buffer-desc) ")")
> indent " "))
> (if org-adapt-indentation
> ***************
> *** 10672,10679 ****
> ".txt"))
> (buffer (find-file-noselect filename))
> (levels-open (make-vector org-level-max nil))
> ! (date (format-time-string "%Y/%m/%d" (current-time)))
> ! (time (format-time-string "%X" (current-time)))
> (author user-full-name)
> (title (buffer-name))
> (options nil)
> --- 10714,10723 ----
> ".txt"))
> (buffer (find-file-noselect filename))
> (levels-open (make-vector org-level-max nil))
> ! (date (format-time-string "%Y/%m/%d" (org-time-stamp-round
> ! (current-time))))
> ! (time (format-time-string "%X" (org-time-stamp-round
> ! (current-time))))
> (author user-full-name)
> (title (buffer-name))
> (options nil)
> ***************
> *** 11012,11019 ****
> ".html"))
> (buffer (find-file-noselect filename))
> (levels-open (make-vector org-level-max nil))
> ! (date (format-time-string "%Y/%m/%d" (current-time)))
> ! (time (format-time-string "%X" (current-time)))
> (author user-full-name)
> (title (buffer-name))
> (options nil)
> --- 11056,11065 ----
> ".html"))
> (buffer (find-file-noselect filename))
> (levels-open (make-vector org-level-max nil))
> ! (date (format-time-string "%Y/%m/%d" (org-time-stamp-round
> ! (current-time))))
> ! (time (format-time-string "%X" (org-time-stamp-round
> ! (current-time))))
> (author user-full-name)
> (title (buffer-name))
> (options nil)
> ***************
> *** 11806,11812 ****
> When COMBINE is non nil, add the category to each line."
> (let ((re2 (concat "--?-?\\(" org-ts-regexp "\\)"))
> (dts (org-ical-ts-to-string
> ! (format-time-string (cdr org-time-stamp-formats)
> (current-time))
> "DTSTART"))
> hd ts ts2 state (inc t) pos scheduledp deadlinep tmp pri)
> (save-excursion
> --- 11852,11860 ----
> When COMBINE is non nil, add the category to each line."
> (let ((re2 (concat "--?-?\\(" org-ts-regexp "\\)"))
> (dts (org-ical-ts-to-string
> ! (format-time-string (cdr org-time-stamp-formats)
> ! (org-time-stamp-round
> ! (current-time)))
> "DTSTART"))
> hd ts ts2 state (inc t) pos scheduledp deadlinep tmp pri)
> (save-excursion
> _______________________________________________
> Emacs-orgmode mailing list
> Emacs-orgmode@gnu.org
> http://lists.gnu.org/mailman/listinfo/emacs-orgmode
>
--
Carsten Dominik
Sterrenkundig Instituut "Anton Pannekoek"
Universiteit van Amsterdam
Kruislaan 403
NL-1098SJ Amsterdam
phone: +31 20 525 7477
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: Suggested change to round timestamps.
@ 2006-03-15 8:16 Thomas Baumann
2006-03-15 21:06 ` Philip Rooke
0 siblings, 1 reply; 5+ messages in thread
From: Thomas Baumann @ 2006-03-15 8:16 UTC (permalink / raw)
To: Carsten Dominik; +Cc: emacs-orgmode
Useful, maybe, for accounting purposes, in this case, the calculation of
the timespan in between could be extended to compute and insert a
rounded value.
For other purposes I would stay with the exact value (which of course
is still possible in Alex version), well, this is my personal opinion.
Thomas
Carsten Dominik <dominik@science.uva.nl> writes:
> Ah, Alex,
>
> yes, thank you for this reminder. Alex did sent me that patch before.
> I remember that I did like the idea but did not put it in because
> there are more places in the code that dead with time stamps and that
> would also have to be modified. So some work would be needed, right
> now I don't know how much out of the top of my head.
>
> More people who would find this useful?
>
> - Carsten
>
>
> On Mar 14, 2006, at 0:43, Alex Bochannek wrote:
>
>> When I first started using Org-mode to keep track of events during the
>> day, I found the timestamp function extremely handy. I didn't want to
>> keep time to the minute, but round to, e.g., fifteen minute intervals.
>>
>> Attached is the patch that I am proposing. Since it was originally
>> against 4.01, I hope I didn't miss anything important.
>>
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: Suggested change to round timestamps.
2006-03-15 8:16 Suggested change to round timestamps Thomas Baumann
@ 2006-03-15 21:06 ` Philip Rooke
2006-03-15 21:34 ` Alex Bochannek
0 siblings, 1 reply; 5+ messages in thread
From: Philip Rooke @ 2006-03-15 21:06 UTC (permalink / raw)
To: thomas.baumann; +Cc: emacs-orgmode
Thomas Baumann <thomas.baumann@ch.tum.de> writes:
> Useful, maybe, for accounting purposes, in this case, the calculation of
> the timespan in between could be extended to compute and insert a
> rounded value.
I agree, definitely a useful extension. I know a number of people who
log/record time to larger units than 1 minute (6 minutes seems to be
common).
> For other purposes I would stay with the exact value (which of course
> is still possible in Alex version)
Likewise, I would stay with the exact value but still like the idea of
being able to do something different.
Regards,
Phil
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: Suggested change to round timestamps.
2006-03-15 21:06 ` Philip Rooke
@ 2006-03-15 21:34 ` Alex Bochannek
0 siblings, 0 replies; 5+ messages in thread
From: Alex Bochannek @ 2006-03-15 21:34 UTC (permalink / raw)
To: emacs-orgmode
Philip Rooke <phil@yax.org.uk> writes:
> Thomas Baumann <thomas.baumann@ch.tum.de> writes:
>
>> Useful, maybe, for accounting purposes, in this case, the calculation of
>> the timespan in between could be extended to compute and insert a
>> rounded value.
>
> I agree, definitely a useful extension. I know a number of people who
> log/record time to larger units than 1 minute (6 minutes seems to be
> common).
It seems like people get used to that when they work in environments
that requires them to submit time cards. Personally, I just find it
annoying to look at the agenda view and see a meeting I attended
listed as 13:02-14:07 :-)
>> For other purposes I would stay with the exact value (which of course
>> is still possible in Alex version)
>
> Likewise, I would stay with the exact value but still like the idea of
> being able to do something different.
I tried to change it in a way that would not affect the existing
functionality. I also looked at all the calls to current-time (in the
4.01 version I started with) and only modified the ones that were
relevant. I did not look at 4.09/4.10 yet.
Alex.
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2006-03-15 21:34 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2006-03-15 8:16 Suggested change to round timestamps Thomas Baumann
2006-03-15 21:06 ` Philip Rooke
2006-03-15 21:34 ` Alex Bochannek
-- strict thread matches above, loose matches on Subject: below --
2006-03-13 23:43 Alex Bochannek
2006-03-15 7:23 ` Carsten Dominik
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).