Mercurial > emacs
annotate lisp/calendar/timeclock.el @ 77485:56922330ce5c
*** empty log message ***
author | Nick Roberts <nickrob@snap.net.nz> |
---|---|
date | Wed, 25 Apr 2007 01:32:35 +0000 |
parents | 7a3f13e2dd57 |
children | 693e049fff70 62f4d9a434ab 95d0cdf160ea |
rev | line source |
---|---|
30781 | 1 ;;; timeclock.el --- mode for keeping track of how much you work |
2 | |
75346 | 3 ;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 |
67465
a55ee709ec8d
Update copyright pending Emacs 22.
Glenn Morris <rgm@gnu.org>
parents:
65680
diff
changeset
|
4 ;; Free Software Foundation, Inc. |
30781 | 5 |
6 ;; Author: John Wiegley <johnw@gnu.org> | |
7 ;; Created: 25 Mar 1999 | |
37651
db867aae3c66
*** empty log message ***
John Wiegley <johnw@newartisans.com>
parents:
37650
diff
changeset
|
8 ;; Version: 2.6 |
30781 | 9 ;; Keywords: calendar data |
10 | |
11 ;; This file is part of GNU Emacs. | |
12 | |
13 ;; GNU Emacs is free software; you can redistribute it and/or modify | |
14 ;; it under the terms of the GNU General Public License as published by | |
15 ;; the Free Software Foundation; either version 2, or (at your option) | |
16 ;; any later version. | |
17 | |
18 ;; GNU Emacs is distributed in the hope that it will be useful, | |
19 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of | |
20 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
21 ;; GNU General Public License for more details. | |
22 | |
23 ;; You should have received a copy of the GNU General Public License | |
24 ;; along with GNU Emacs; see the file COPYING. If not, write to the | |
64085 | 25 ;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, |
26 ;; Boston, MA 02110-1301, USA. | |
30781 | 27 |
28 ;;; Commentary: | |
29 | |
30 ;; This mode is for keeping track of time intervals. You can use it | |
31 ;; for whatever purpose you like, but the typical scenario is to keep | |
32 ;; track of how much time you spend working on certain projects. | |
33 ;; | |
34 ;; Use `timeclock-in' when you start on a project, and `timeclock-out' | |
35 ;; when you're done. Once you've collected some data, you can use | |
36 ;; `timeclock-workday-remaining' to see how much time is left to be | |
51871 | 37 ;; worked today (where `timeclock-workday' specifies the length of the |
38 ;; working day), and `timeclock-when-to-leave' to calculate when you're free. | |
30781 | 39 |
40 ;; You'll probably want to bind the timeclock commands to some handy | |
51871 | 41 ;; keystrokes. At the moment, C-x t is unused: |
30781 | 42 ;; |
43 ;; (require 'timeclock) | |
44 ;; | |
45 ;; (define-key ctl-x-map "ti" 'timeclock-in) | |
46 ;; (define-key ctl-x-map "to" 'timeclock-out) | |
47 ;; (define-key ctl-x-map "tc" 'timeclock-change) | |
48 ;; (define-key ctl-x-map "tr" 'timeclock-reread-log) | |
49 ;; (define-key ctl-x-map "tu" 'timeclock-update-modeline) | |
50 ;; (define-key ctl-x-map "tw" 'timeclock-when-to-leave-string) | |
51 | |
52 ;; If you want Emacs to display the amount of time "left" to your | |
53 ;; workday in the modeline, you can either set the value of | |
54 ;; `timeclock-modeline-display' to t using M-x customize, or you | |
55 ;; can add this code to your .emacs file: | |
56 ;; | |
57 ;; (require 'timeclock) | |
58 ;; (timeclock-modeline-display) | |
59 ;; | |
60 ;; To cancel this modeline display at any time, just call | |
61 ;; `timeclock-modeline-display' again. | |
62 | |
63 ;; You may also want Emacs to ask you before exiting, if you are | |
54704 | 64 ;; currently working on a project. This can be done either by setting |
30781 | 65 ;; `timeclock-ask-before-exiting' to t using M-x customize (this is |
66 ;; the default), or by adding the following to your .emacs file: | |
67 ;; | |
51263 | 68 ;; (add-hook 'kill-emacs-query-functions 'timeclock-query-out) |
30781 | 69 |
70 ;; NOTE: If you change your .timelog file without using timeclock's | |
71 ;; functions, or if you change the value of any of timeclock's | |
72 ;; customizable variables, you should run the command | |
73 ;; `timeclock-reread-log'. This will recompute any discrepancies in | |
74 ;; your average working time, and will make sure that the various | |
75 ;; display functions return the correct value. | |
76 | |
77 ;;; History: | |
78 | |
79 ;;; Code: | |
80 | |
81 (defgroup timeclock nil | |
61327 | 82 "Keeping track of the time that gets spent." |
30781 | 83 :group 'data) |
84 | |
85 ;;; User Variables: | |
86 | |
30795
5b4027fef808
(timeclock-file): Run .timelog through convert-standard-filename.
Eli Zaretskii <eliz@gnu.org>
parents:
30781
diff
changeset
|
87 (defcustom timeclock-file (convert-standard-filename "~/.timelog") |
30781 | 88 "*The file used to store timeclock data in." |
89 :type 'file | |
90 :group 'timeclock) | |
91 | |
92 (defcustom timeclock-workday (* 8 60 60) | |
93 "*The length of a work period." | |
94 :type 'integer | |
95 :group 'timeclock) | |
96 | |
97 (defcustom timeclock-relative t | |
72331
4e0c58818901
(timeclock-use-elapsed): Added a new variable, which causes timeclock
John Wiegley <johnw@newartisans.com>
parents:
68721
diff
changeset
|
98 "*Whether to make reported time relative to `timeclock-workday'. |
30781 | 99 For example, if the length of a normal workday is eight hours, and you |
100 work four hours on Monday, then the amount of time \"remaining\" on | |
101 Tuesday is twelve hours -- relative to an averaged work period of | |
102 eight hours -- or eight hours, non-relative. So relative time takes | |
51871 | 103 into account any discrepancy of time under-worked or over-worked on |
104 previous days. This only affects the timeclock modeline display." | |
30781 | 105 :type 'boolean |
106 :group 'timeclock) | |
107 | |
108 (defcustom timeclock-get-project-function 'timeclock-ask-for-project | |
109 "*The function used to determine the name of the current project. | |
110 When clocking in, and no project is specified, this function will be | |
54704 | 111 called to determine what is the current project to be worked on. |
30781 | 112 If this variable is nil, no questions will be asked." |
113 :type 'function | |
114 :group 'timeclock) | |
115 | |
116 (defcustom timeclock-get-reason-function 'timeclock-ask-for-reason | |
117 "*A function used to determine the reason for clocking out. | |
118 When clocking out, and no reason is specified, this function will be | |
54704 | 119 called to determine what is the reason. |
30781 | 120 If this variable is nil, no questions will be asked." |
121 :type 'function | |
122 :group 'timeclock) | |
123 | |
124 (defcustom timeclock-get-workday-function nil | |
125 "*A function used to determine the length of today's workday. | |
126 The first time that a user clocks in each day, this function will be | |
54704 | 127 called to determine what is the length of the current workday. If |
46341
ff3a56c0df0f
(timeclock-get-workday-function): `timeclock-workday' is not a valid
Glenn Morris <rgm@gnu.org>
parents:
46160
diff
changeset
|
128 the return value is nil, or equal to `timeclock-workday', nothing special |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48224
diff
changeset
|
129 will be done. If it is a quantity different from `timeclock-workday', |
46341
ff3a56c0df0f
(timeclock-get-workday-function): `timeclock-workday' is not a valid
Glenn Morris <rgm@gnu.org>
parents:
46160
diff
changeset
|
130 however, a record will be output to the timelog file to note the fact that |
54704 | 131 that day has a length that is different from the norm." |
46341
ff3a56c0df0f
(timeclock-get-workday-function): `timeclock-workday' is not a valid
Glenn Morris <rgm@gnu.org>
parents:
46160
diff
changeset
|
132 :type '(choice (const nil) function) |
30781 | 133 :group 'timeclock) |
134 | |
135 (defcustom timeclock-ask-before-exiting t | |
51871 | 136 "*If non-nil, ask if the user wants to clock out before exiting Emacs. |
54704 | 137 This variable only has effect if set with \\[customize]." |
30781 | 138 :set (lambda (symbol value) |
139 (if value | |
51263 | 140 (add-hook 'kill-emacs-query-functions 'timeclock-query-out) |
141 (remove-hook 'kill-emacs-query-functions 'timeclock-query-out)) | |
30781 | 142 (setq timeclock-ask-before-exiting value)) |
143 :type 'boolean | |
144 :group 'timeclock) | |
145 | |
146 (defvar timeclock-update-timer nil | |
147 "The timer used to update `timeclock-mode-string'.") | |
148 | |
51549
48facdb1558e
(display-time-hook, timeclock-modeline-display): Define for byte-compiler.
Glenn Morris <rgm@gnu.org>
parents:
51263
diff
changeset
|
149 ;; For byte-compiler. |
48facdb1558e
(display-time-hook, timeclock-modeline-display): Define for byte-compiler.
Glenn Morris <rgm@gnu.org>
parents:
51263
diff
changeset
|
150 (defvar display-time-hook) |
48facdb1558e
(display-time-hook, timeclock-modeline-display): Define for byte-compiler.
Glenn Morris <rgm@gnu.org>
parents:
51263
diff
changeset
|
151 (defvar timeclock-modeline-display) |
48facdb1558e
(display-time-hook, timeclock-modeline-display): Define for byte-compiler.
Glenn Morris <rgm@gnu.org>
parents:
51263
diff
changeset
|
152 |
30781 | 153 (defcustom timeclock-use-display-time t |
154 "*If non-nil, use `display-time-hook' for doing modeline updates. | |
54704 | 155 The advantage of this is that one less timer has to be set running |
156 amok in Emacs' process space. The disadvantage is that it requires | |
157 you to have `display-time' running. If you don't want to use | |
30781 | 158 `display-time', but still want the modeline to show how much time is |
51871 | 159 left, set this variable to nil. Changing the value of this variable |
160 while timeclock information is being displayed in the modeline has no | |
161 effect. You should call the function `timeclock-modeline-display' with | |
162 a positive argument to force an update." | |
30781 | 163 :set (lambda (symbol value) |
164 (let ((currently-displaying | |
165 (and (boundp 'timeclock-modeline-display) | |
166 timeclock-modeline-display))) | |
167 ;; if we're changing to the state that | |
168 ;; `timeclock-modeline-display' is already using, don't | |
169 ;; bother toggling it. This happens on the initial loading | |
170 ;; of timeclock.el. | |
171 (if (and currently-displaying | |
172 (or (and value | |
173 (boundp 'display-time-hook) | |
174 (memq 'timeclock-update-modeline | |
175 display-time-hook)) | |
176 (and (not value) | |
177 timeclock-update-timer))) | |
178 (setq currently-displaying nil)) | |
179 (and currently-displaying | |
37437
ed485de91fcf
(timeclock-day-required): If the time required for a particular day is
John Wiegley <johnw@newartisans.com>
parents:
37324
diff
changeset
|
180 (set-variable 'timeclock-modeline-display nil)) |
30781 | 181 (setq timeclock-use-display-time value) |
182 (and currently-displaying | |
37437
ed485de91fcf
(timeclock-day-required): If the time required for a particular day is
John Wiegley <johnw@newartisans.com>
parents:
37324
diff
changeset
|
183 (set-variable 'timeclock-modeline-display t)) |
30781 | 184 timeclock-use-display-time)) |
185 :type 'boolean | |
186 :group 'timeclock | |
187 :require 'time) | |
188 | |
189 (defcustom timeclock-first-in-hook nil | |
190 "*A hook run for the first \"in\" event each day. | |
191 Note that this hook is run before recording any events. Thus the | |
192 value of `timeclock-hours-today', `timeclock-last-event' and the | |
193 return value of function `timeclock-last-period' are relative previous | |
194 to today." | |
195 :type 'hook | |
196 :group 'timeclock) | |
197 | |
198 (defcustom timeclock-load-hook nil | |
199 "*Hook that gets run after timeclock has been loaded." | |
200 :type 'hook | |
201 :group 'timeclock) | |
202 | |
203 (defcustom timeclock-in-hook nil | |
204 "*A hook run every time an \"in\" event is recorded." | |
205 :type 'hook | |
206 :group 'timeclock) | |
207 | |
208 (defcustom timeclock-day-over-hook nil | |
209 "*A hook that is run when the workday has been completed. | |
51861
91e4e5fd11de
(timeclock-use-display-time, timeclock-day-over-hook)
Glenn Morris <rgm@gnu.org>
parents:
51549
diff
changeset
|
210 This hook is only run if the current time remaining is being displayed |
30781 | 211 in the modeline. See the variable `timeclock-modeline-display'." |
212 :type 'hook | |
213 :group 'timeclock) | |
214 | |
215 (defcustom timeclock-out-hook nil | |
216 "*A hook run every time an \"out\" event is recorded." | |
217 :type 'hook | |
218 :group 'timeclock) | |
219 | |
220 (defcustom timeclock-done-hook nil | |
221 "*A hook run every time a project is marked as completed." | |
222 :type 'hook | |
223 :group 'timeclock) | |
224 | |
225 (defcustom timeclock-event-hook nil | |
226 "*A hook run every time any event is recorded." | |
227 :type 'hook | |
228 :group 'timeclock) | |
229 | |
230 (defvar timeclock-last-event nil | |
231 "A list containing the last event that was recorded. | |
33020 | 232 The format of this list is (CODE TIME PROJECT).") |
30781 | 233 |
234 (defvar timeclock-last-event-workday nil | |
235 "The number of seconds in the workday of `timeclock-last-event'.") | |
236 | |
237 ;;; Internal Variables: | |
238 | |
239 (defvar timeclock-discrepancy nil | |
240 "A variable containing the time discrepancy before the last event. | |
241 Normally, timeclock assumes that you intend to work for | |
242 `timeclock-workday' seconds every day. Any days in which you work | |
243 more or less than this amount is considered either a positive or | |
54704 | 244 a negative discrepancy. If you work in such a manner that the |
30781 | 245 discrepancy is always brought back to zero, then you will by |
246 definition have worked an average amount equal to `timeclock-workday' | |
247 each day.") | |
248 | |
249 (defvar timeclock-elapsed nil | |
250 "A variable containing the time elapsed for complete periods today. | |
251 This value is not accurate enough to be useful by itself. Rather, | |
252 call `timeclock-workday-elapsed', to determine how much time has been | |
253 worked so far today. Also, if `timeclock-relative' is nil, this value | |
72331
4e0c58818901
(timeclock-use-elapsed): Added a new variable, which causes timeclock
John Wiegley <johnw@newartisans.com>
parents:
68721
diff
changeset
|
254 will be the same as `timeclock-discrepancy'.") |
4e0c58818901
(timeclock-use-elapsed): Added a new variable, which causes timeclock
John Wiegley <johnw@newartisans.com>
parents:
68721
diff
changeset
|
255 |
4e0c58818901
(timeclock-use-elapsed): Added a new variable, which causes timeclock
John Wiegley <johnw@newartisans.com>
parents:
68721
diff
changeset
|
256 (defvar timeclock-use-elapsed nil |
4e0c58818901
(timeclock-use-elapsed): Added a new variable, which causes timeclock
John Wiegley <johnw@newartisans.com>
parents:
68721
diff
changeset
|
257 "Non-nil if the modeline should display time elapsed, not remaining.") |
30781 | 258 |
259 (defvar timeclock-last-period nil | |
260 "Integer representing the number of seconds in the last period. | |
54704 | 261 Note that you shouldn't access this value, but instead should use the |
262 function `timeclock-last-period'.") | |
30781 | 263 |
264 (defvar timeclock-mode-string nil | |
51263 | 265 "The timeclock string (optionally) displayed in the modeline. |
266 The time is bracketed by <> if you are clocked in, otherwise by [].") | |
30781 | 267 |
268 (defvar timeclock-day-over nil | |
269 "The date of the last day when notified \"day over\" for.") | |
270 | |
271 ;;; User Functions: | |
272 | |
273 ;;;###autoload | |
274 (defun timeclock-modeline-display (&optional arg) | |
275 "Toggle display of the amount of time left today in the modeline. | |
51263 | 276 If `timeclock-use-display-time' is non-nil (the default), then |
277 the function `display-time-mode' must be active, and the modeline | |
278 will be updated whenever the time display is updated. Otherwise, | |
279 the timeclock will use its own sixty second timer to do its | |
280 updating. With prefix ARG, turn modeline display on if and only | |
281 if ARG is positive. Returns the new status of timeclock modeline | |
282 display (non-nil means on)." | |
30781 | 283 (interactive "P") |
51263 | 284 ;; cf display-time-mode. |
285 (setq timeclock-mode-string "") | |
286 (or global-mode-string (setq global-mode-string '(""))) | |
30781 | 287 (let ((on-p (if arg |
288 (> (prefix-numeric-value arg) 0) | |
289 (not timeclock-modeline-display)))) | |
290 (if on-p | |
51263 | 291 (progn |
292 (or (memq 'timeclock-mode-string global-mode-string) | |
293 (setq global-mode-string | |
294 (append global-mode-string '(timeclock-mode-string)))) | |
30781 | 295 (unless (memq 'timeclock-update-modeline timeclock-event-hook) |
296 (add-hook 'timeclock-event-hook 'timeclock-update-modeline)) | |
297 (when timeclock-update-timer | |
298 (cancel-timer timeclock-update-timer) | |
299 (setq timeclock-update-timer nil)) | |
300 (if (boundp 'display-time-hook) | |
301 (remove-hook 'display-time-hook 'timeclock-update-modeline)) | |
302 (if timeclock-use-display-time | |
51263 | 303 (progn |
304 ;; Update immediately so there is a visible change | |
305 ;; on calling this function. | |
51871 | 306 (if display-time-mode (timeclock-update-modeline) |
307 (message "Activate `display-time-mode' to see \ | |
308 timeclock information")) | |
51263 | 309 (add-hook 'display-time-hook 'timeclock-update-modeline)) |
30781 | 310 (setq timeclock-update-timer |
311 (run-at-time nil 60 'timeclock-update-modeline)))) | |
51861
91e4e5fd11de
(timeclock-use-display-time, timeclock-day-over-hook)
Glenn Morris <rgm@gnu.org>
parents:
51549
diff
changeset
|
312 (setq global-mode-string |
51263 | 313 (delq 'timeclock-mode-string global-mode-string)) |
30781 | 314 (remove-hook 'timeclock-event-hook 'timeclock-update-modeline) |
315 (if (boundp 'display-time-hook) | |
316 (remove-hook 'display-time-hook | |
317 'timeclock-update-modeline)) | |
318 (when timeclock-update-timer | |
319 (cancel-timer timeclock-update-timer) | |
320 (setq timeclock-update-timer nil))) | |
321 (force-mode-line-update) | |
51861
91e4e5fd11de
(timeclock-use-display-time, timeclock-day-over-hook)
Glenn Morris <rgm@gnu.org>
parents:
51549
diff
changeset
|
322 (setq timeclock-modeline-display on-p))) |
30781 | 323 |
324 ;; This has to be here so that the function definition of | |
325 ;; `timeclock-modeline-display' is known to the "set" function. | |
326 (defcustom timeclock-modeline-display nil | |
327 "Toggle modeline display of time remaining. | |
328 You must modify via \\[customize] for this variable to have an effect." | |
329 :set (lambda (symbol value) | |
330 (setq timeclock-modeline-display | |
331 (timeclock-modeline-display (or value 0)))) | |
332 :type 'boolean | |
333 :group 'timeclock | |
334 :require 'timeclock) | |
335 | |
51549
48facdb1558e
(display-time-hook, timeclock-modeline-display): Define for byte-compiler.
Glenn Morris <rgm@gnu.org>
parents:
51263
diff
changeset
|
336 (defsubst timeclock-time-to-date (time) |
48facdb1558e
(display-time-hook, timeclock-modeline-display): Define for byte-compiler.
Glenn Morris <rgm@gnu.org>
parents:
51263
diff
changeset
|
337 "Convert the TIME value to a textual date string." |
48facdb1558e
(display-time-hook, timeclock-modeline-display): Define for byte-compiler.
Glenn Morris <rgm@gnu.org>
parents:
51263
diff
changeset
|
338 (format-time-string "%Y/%m/%d" time)) |
48facdb1558e
(display-time-hook, timeclock-modeline-display): Define for byte-compiler.
Glenn Morris <rgm@gnu.org>
parents:
51263
diff
changeset
|
339 |
30781 | 340 ;;;###autoload |
341 (defun timeclock-in (&optional arg project find-project) | |
342 "Clock in, recording the current time moment in the timelog. | |
343 With a numeric prefix ARG, record the fact that today has only that | |
344 many hours in it to be worked. If arg is a non-numeric prefix arg | |
345 \(non-nil, but not a number), 0 is assumed (working on a holiday or | |
346 weekend). *If not called interactively, ARG should be the number of | |
347 _seconds_ worked today*. This feature only has effect the first time | |
348 this function is called within a day. | |
349 | |
54704 | 350 PROJECT is the project being clocked into. If PROJECT is nil, and |
30781 | 351 FIND-PROJECT is non-nil -- or the user calls `timeclock-in' |
352 interactively -- call the function `timeclock-get-project-function' to | |
353 discover the name of the project." | |
354 (interactive | |
355 (list (and current-prefix-arg | |
356 (if (numberp current-prefix-arg) | |
357 (* current-prefix-arg 60 60) | |
358 0)))) | |
359 (if (equal (car timeclock-last-event) "i") | |
360 (error "You've already clocked in!") | |
361 (unless timeclock-last-event | |
362 (timeclock-reread-log)) | |
46350
9cead6e97a53
(timeclock-in): Run the new day section if, after rereading the log file,
Glenn Morris <rgm@gnu.org>
parents:
46341
diff
changeset
|
363 ;; Either no log file, or day has rolled over. |
9cead6e97a53
(timeclock-in): Run the new day section if, after rereading the log file,
Glenn Morris <rgm@gnu.org>
parents:
46341
diff
changeset
|
364 (unless (and timeclock-last-event |
9cead6e97a53
(timeclock-in): Run the new day section if, after rereading the log file,
Glenn Morris <rgm@gnu.org>
parents:
46341
diff
changeset
|
365 (equal (timeclock-time-to-date |
9cead6e97a53
(timeclock-in): Run the new day section if, after rereading the log file,
Glenn Morris <rgm@gnu.org>
parents:
46341
diff
changeset
|
366 (cadr timeclock-last-event)) |
9cead6e97a53
(timeclock-in): Run the new day section if, after rereading the log file,
Glenn Morris <rgm@gnu.org>
parents:
46341
diff
changeset
|
367 (timeclock-time-to-date (current-time)))) |
30781 | 368 (let ((workday (or (and (numberp arg) arg) |
369 (and arg 0) | |
370 (and timeclock-get-workday-function | |
371 (funcall timeclock-get-workday-function)) | |
372 timeclock-workday))) | |
373 (run-hooks 'timeclock-first-in-hook) | |
374 ;; settle the discrepancy for the new day | |
375 (setq timeclock-discrepancy | |
46350
9cead6e97a53
(timeclock-in): Run the new day section if, after rereading the log file,
Glenn Morris <rgm@gnu.org>
parents:
46341
diff
changeset
|
376 (- (or timeclock-discrepancy 0) workday)) |
30781 | 377 (if (not (= workday timeclock-workday)) |
378 (timeclock-log "h" (and (numberp arg) | |
379 (number-to-string arg)))))) | |
380 (timeclock-log "i" (or project | |
381 (and timeclock-get-project-function | |
382 (or find-project (interactive-p)) | |
383 (funcall timeclock-get-project-function)))) | |
384 (run-hooks 'timeclock-in-hook))) | |
385 | |
386 ;;;###autoload | |
387 (defun timeclock-out (&optional arg reason find-reason) | |
388 "Clock out, recording the current time moment in the timelog. | |
389 If a prefix ARG is given, the user has completed the project that was | |
390 begun during the last time segment. | |
391 | |
392 REASON is the user's reason for clocking out. If REASON is nil, and | |
393 FIND-REASON is non-nil -- or the user calls `timeclock-out' | |
394 interactively -- call the function `timeclock-get-reason-function' to | |
395 discover the reason." | |
396 (interactive "P") | |
40671
526c9b7941f5
(timeclock-out): Signal an error if timeclock-last-event is nil.
Eli Zaretskii <eliz@gnu.org>
parents:
37652
diff
changeset
|
397 (or timeclock-last-event |
526c9b7941f5
(timeclock-out): Signal an error if timeclock-last-event is nil.
Eli Zaretskii <eliz@gnu.org>
parents:
37652
diff
changeset
|
398 (error "You haven't clocked in!")) |
30781 | 399 (if (equal (downcase (car timeclock-last-event)) "o") |
400 (error "You've already clocked out!") | |
401 (timeclock-log | |
402 (if arg "O" "o") | |
403 (or reason | |
404 (and timeclock-get-reason-function | |
405 (or find-reason (interactive-p)) | |
406 (funcall timeclock-get-reason-function)))) | |
407 (run-hooks 'timeclock-out-hook) | |
408 (if arg | |
409 (run-hooks 'timeclock-done-hook)))) | |
410 | |
51861
91e4e5fd11de
(timeclock-use-display-time, timeclock-day-over-hook)
Glenn Morris <rgm@gnu.org>
parents:
51549
diff
changeset
|
411 ;; Should today-only be removed in favour of timeclock-relative? - gm |
51549
48facdb1558e
(display-time-hook, timeclock-modeline-display): Define for byte-compiler.
Glenn Morris <rgm@gnu.org>
parents:
51263
diff
changeset
|
412 (defsubst timeclock-workday-remaining (&optional today-only) |
48facdb1558e
(display-time-hook, timeclock-modeline-display): Define for byte-compiler.
Glenn Morris <rgm@gnu.org>
parents:
51263
diff
changeset
|
413 "Return the number of seconds until the workday is complete. |
48facdb1558e
(display-time-hook, timeclock-modeline-display): Define for byte-compiler.
Glenn Morris <rgm@gnu.org>
parents:
51263
diff
changeset
|
414 The amount returned is relative to the value of `timeclock-workday'. |
48facdb1558e
(display-time-hook, timeclock-modeline-display): Define for byte-compiler.
Glenn Morris <rgm@gnu.org>
parents:
51263
diff
changeset
|
415 If TODAY-ONLY is non-nil, the value returned will be relative only to |
51861
91e4e5fd11de
(timeclock-use-display-time, timeclock-day-over-hook)
Glenn Morris <rgm@gnu.org>
parents:
51549
diff
changeset
|
416 the time worked today, and not to past time." |
51549
48facdb1558e
(display-time-hook, timeclock-modeline-display): Define for byte-compiler.
Glenn Morris <rgm@gnu.org>
parents:
51263
diff
changeset
|
417 (let ((discrep (timeclock-find-discrep))) |
48facdb1558e
(display-time-hook, timeclock-modeline-display): Define for byte-compiler.
Glenn Morris <rgm@gnu.org>
parents:
51263
diff
changeset
|
418 (if discrep |
51861
91e4e5fd11de
(timeclock-use-display-time, timeclock-day-over-hook)
Glenn Morris <rgm@gnu.org>
parents:
51549
diff
changeset
|
419 (- (if today-only (cadr discrep) |
91e4e5fd11de
(timeclock-use-display-time, timeclock-day-over-hook)
Glenn Morris <rgm@gnu.org>
parents:
51549
diff
changeset
|
420 (car discrep))) |
51549
48facdb1558e
(display-time-hook, timeclock-modeline-display): Define for byte-compiler.
Glenn Morris <rgm@gnu.org>
parents:
51263
diff
changeset
|
421 0.0))) |
48facdb1558e
(display-time-hook, timeclock-modeline-display): Define for byte-compiler.
Glenn Morris <rgm@gnu.org>
parents:
51263
diff
changeset
|
422 |
30781 | 423 ;;;###autoload |
424 (defun timeclock-status-string (&optional show-seconds today-only) | |
51861
91e4e5fd11de
(timeclock-use-display-time, timeclock-day-over-hook)
Glenn Morris <rgm@gnu.org>
parents:
51549
diff
changeset
|
425 "Report the overall timeclock status at the present moment. |
91e4e5fd11de
(timeclock-use-display-time, timeclock-day-over-hook)
Glenn Morris <rgm@gnu.org>
parents:
51549
diff
changeset
|
426 If SHOW-SECONDS is non-nil, display second resolution. |
91e4e5fd11de
(timeclock-use-display-time, timeclock-day-over-hook)
Glenn Morris <rgm@gnu.org>
parents:
51549
diff
changeset
|
427 If TODAY-ONLY is non-nil, the display will be relative only to time |
91e4e5fd11de
(timeclock-use-display-time, timeclock-day-over-hook)
Glenn Morris <rgm@gnu.org>
parents:
51549
diff
changeset
|
428 worked today, ignoring the time worked on previous days." |
30781 | 429 (interactive "P") |
72331
4e0c58818901
(timeclock-use-elapsed): Added a new variable, which causes timeclock
John Wiegley <johnw@newartisans.com>
parents:
68721
diff
changeset
|
430 (let ((remainder (timeclock-workday-remaining |
4e0c58818901
(timeclock-use-elapsed): Added a new variable, which causes timeclock
John Wiegley <johnw@newartisans.com>
parents:
68721
diff
changeset
|
431 (or today-only |
4e0c58818901
(timeclock-use-elapsed): Added a new variable, which causes timeclock
John Wiegley <johnw@newartisans.com>
parents:
68721
diff
changeset
|
432 (not timeclock-relative)))) |
51549
48facdb1558e
(display-time-hook, timeclock-modeline-display): Define for byte-compiler.
Glenn Morris <rgm@gnu.org>
parents:
51263
diff
changeset
|
433 (last-in (equal (car timeclock-last-event) "i")) |
48facdb1558e
(display-time-hook, timeclock-modeline-display): Define for byte-compiler.
Glenn Morris <rgm@gnu.org>
parents:
51263
diff
changeset
|
434 status) |
30781 | 435 (setq status |
436 (format "Currently %s since %s (%s), %s %s, leave at %s" | |
437 (if last-in "IN" "OUT") | |
438 (if show-seconds | |
439 (format-time-string "%-I:%M:%S %p" | |
440 (nth 1 timeclock-last-event)) | |
441 (format-time-string "%-I:%M %p" | |
442 (nth 1 timeclock-last-event))) | |
443 (or (nth 2 timeclock-last-event) | |
444 (if last-in "**UNKNOWN**" "workday over")) | |
445 (timeclock-seconds-to-string remainder show-seconds t) | |
446 (if (> remainder 0) | |
447 "remaining" "over") | |
448 (timeclock-when-to-leave-string show-seconds today-only))) | |
449 (if (interactive-p) | |
65591
a65f8ec418fc
message format spec fixes, commit # 10
Deepak Goel <deego@gnufans.org>
parents:
64085
diff
changeset
|
450 (message "%s" status) |
30781 | 451 status))) |
452 | |
453 ;;;###autoload | |
454 (defun timeclock-change (&optional arg project) | |
54704 | 455 "Change to working on a different project. |
456 This clocks out of the current project, then clocks in on a new one. | |
457 With a prefix ARG, consider the previous project as finished at the | |
458 time of changeover. PROJECT is the name of the last project you were | |
459 working on." | |
30781 | 460 (interactive "P") |
461 (timeclock-out arg) | |
462 (timeclock-in nil project (interactive-p))) | |
463 | |
464 ;;;###autoload | |
465 (defun timeclock-query-out () | |
54704 | 466 "Ask the user whether to clock out. |
51263 | 467 This is a useful function for adding to `kill-emacs-query-functions'." |
51549
48facdb1558e
(display-time-hook, timeclock-modeline-display): Define for byte-compiler.
Glenn Morris <rgm@gnu.org>
parents:
51263
diff
changeset
|
468 (and (equal (car timeclock-last-event) "i") |
48facdb1558e
(display-time-hook, timeclock-modeline-display): Define for byte-compiler.
Glenn Morris <rgm@gnu.org>
parents:
51263
diff
changeset
|
469 (y-or-n-p "You're currently clocking time, clock out? ") |
48facdb1558e
(display-time-hook, timeclock-modeline-display): Define for byte-compiler.
Glenn Morris <rgm@gnu.org>
parents:
51263
diff
changeset
|
470 (timeclock-out)) |
48facdb1558e
(display-time-hook, timeclock-modeline-display): Define for byte-compiler.
Glenn Morris <rgm@gnu.org>
parents:
51263
diff
changeset
|
471 ;; Unconditionally return t for `kill-emacs-query-functions'. |
48facdb1558e
(display-time-hook, timeclock-modeline-display): Define for byte-compiler.
Glenn Morris <rgm@gnu.org>
parents:
51263
diff
changeset
|
472 t) |
30781 | 473 |
474 ;;;###autoload | |
475 (defun timeclock-reread-log () | |
476 "Re-read the timeclock, to account for external changes. | |
477 Returns the new value of `timeclock-discrepancy'." | |
478 (interactive) | |
479 (setq timeclock-discrepancy nil) | |
480 (timeclock-find-discrep) | |
36851 | 481 (if (and timeclock-discrepancy timeclock-modeline-display) |
30781 | 482 (timeclock-update-modeline)) |
483 timeclock-discrepancy) | |
484 | |
485 (defun timeclock-seconds-to-string (seconds &optional show-seconds | |
486 reverse-leader) | |
487 "Convert SECONDS into a compact time string. | |
488 If SHOW-SECONDS is non-nil, make the resolution of the return string | |
489 include the second count. If REVERSE-LEADER is non-nil, it means to | |
490 output a \"+\" if the time value is negative, rather than a \"-\". | |
491 This is used when negative time values have an inverted meaning (such | |
492 as with time remaining, where negative time really means overtime)." | |
493 (if show-seconds | |
494 (format "%s%d:%02d:%02d" | |
495 (if (< seconds 0) (if reverse-leader "+" "-") "") | |
496 (truncate (/ (abs seconds) 60 60)) | |
497 (% (truncate (/ (abs seconds) 60)) 60) | |
498 (% (truncate (abs seconds)) 60)) | |
499 (format "%s%d:%02d" | |
500 (if (< seconds 0) (if reverse-leader "+" "-") "") | |
501 (truncate (/ (abs seconds) 60 60)) | |
502 (% (truncate (/ (abs seconds) 60)) 60)))) | |
503 | |
33020 | 504 (defsubst timeclock-currently-in-p () |
30781 | 505 "Return non-nil if the user is currently clocked in." |
506 (equal (car timeclock-last-event) "i")) | |
507 | |
508 ;;;###autoload | |
509 (defun timeclock-workday-remaining-string (&optional show-seconds | |
510 today-only) | |
511 "Return a string representing the amount of time left today. | |
512 Display second resolution if SHOW-SECONDS is non-nil. If TODAY-ONLY | |
513 is non-nil, the display will be relative only to time worked today. | |
514 See `timeclock-relative' for more information about the meaning of | |
515 \"relative to today\"." | |
516 (interactive) | |
517 (let ((string (timeclock-seconds-to-string | |
518 (timeclock-workday-remaining today-only) | |
519 show-seconds t))) | |
520 (if (interactive-p) | |
65591
a65f8ec418fc
message format spec fixes, commit # 10
Deepak Goel <deego@gnufans.org>
parents:
64085
diff
changeset
|
521 (message "%s" string) |
30781 | 522 string))) |
523 | |
37625
53351976477e
(timeclock-workday-remaining): Changed logic for determining how much
John Wiegley <johnw@newartisans.com>
parents:
37437
diff
changeset
|
524 (defsubst timeclock-workday-elapsed () |
46160
b88409633904
(timeclock-workday-remaining): Fix typo.
Juanma Barranquero <lekktu@gmail.com>
parents:
40671
diff
changeset
|
525 "Return the number of seconds worked so far today. |
30781 | 526 If RELATIVE is non-nil, the amount returned will be relative to past |
527 time worked. The default is to return only the time that has elapsed | |
528 so far today." | |
37625
53351976477e
(timeclock-workday-remaining): Changed logic for determining how much
John Wiegley <johnw@newartisans.com>
parents:
37437
diff
changeset
|
529 (let ((discrep (timeclock-find-discrep))) |
53351976477e
(timeclock-workday-remaining): Changed logic for determining how much
John Wiegley <johnw@newartisans.com>
parents:
37437
diff
changeset
|
530 (if discrep |
53351976477e
(timeclock-workday-remaining): Changed logic for determining how much
John Wiegley <johnw@newartisans.com>
parents:
37437
diff
changeset
|
531 (nth 2 discrep) |
53351976477e
(timeclock-workday-remaining): Changed logic for determining how much
John Wiegley <johnw@newartisans.com>
parents:
37437
diff
changeset
|
532 0.0))) |
30781 | 533 |
534 ;;;###autoload | |
37625
53351976477e
(timeclock-workday-remaining): Changed logic for determining how much
John Wiegley <johnw@newartisans.com>
parents:
37437
diff
changeset
|
535 (defun timeclock-workday-elapsed-string (&optional show-seconds) |
30781 | 536 "Return a string representing the amount of time worked today. |
537 Display seconds resolution if SHOW-SECONDS is non-nil. If RELATIVE is | |
538 non-nil, the amount returned will be relative to past time worked." | |
539 (interactive) | |
37625
53351976477e
(timeclock-workday-remaining): Changed logic for determining how much
John Wiegley <johnw@newartisans.com>
parents:
37437
diff
changeset
|
540 (let ((string (timeclock-seconds-to-string (timeclock-workday-elapsed) |
53351976477e
(timeclock-workday-remaining): Changed logic for determining how much
John Wiegley <johnw@newartisans.com>
parents:
37437
diff
changeset
|
541 show-seconds))) |
30781 | 542 (if (interactive-p) |
65591
a65f8ec418fc
message format spec fixes, commit # 10
Deepak Goel <deego@gnufans.org>
parents:
64085
diff
changeset
|
543 (message "%s" string) |
30781 | 544 string))) |
545 | |
51549
48facdb1558e
(display-time-hook, timeclock-modeline-display): Define for byte-compiler.
Glenn Morris <rgm@gnu.org>
parents:
51263
diff
changeset
|
546 (defsubst timeclock-time-to-seconds (time) |
48facdb1558e
(display-time-hook, timeclock-modeline-display): Define for byte-compiler.
Glenn Morris <rgm@gnu.org>
parents:
51263
diff
changeset
|
547 "Convert TIME to a floating point number." |
48facdb1558e
(display-time-hook, timeclock-modeline-display): Define for byte-compiler.
Glenn Morris <rgm@gnu.org>
parents:
51263
diff
changeset
|
548 (+ (* (car time) 65536.0) |
48facdb1558e
(display-time-hook, timeclock-modeline-display): Define for byte-compiler.
Glenn Morris <rgm@gnu.org>
parents:
51263
diff
changeset
|
549 (cadr time) |
48facdb1558e
(display-time-hook, timeclock-modeline-display): Define for byte-compiler.
Glenn Morris <rgm@gnu.org>
parents:
51263
diff
changeset
|
550 (/ (or (car (cdr (cdr time))) 0) 1000000.0))) |
48facdb1558e
(display-time-hook, timeclock-modeline-display): Define for byte-compiler.
Glenn Morris <rgm@gnu.org>
parents:
51263
diff
changeset
|
551 |
48facdb1558e
(display-time-hook, timeclock-modeline-display): Define for byte-compiler.
Glenn Morris <rgm@gnu.org>
parents:
51263
diff
changeset
|
552 (defsubst timeclock-seconds-to-time (seconds) |
48facdb1558e
(display-time-hook, timeclock-modeline-display): Define for byte-compiler.
Glenn Morris <rgm@gnu.org>
parents:
51263
diff
changeset
|
553 "Convert SECONDS (a floating point number) to an Emacs time structure." |
48facdb1558e
(display-time-hook, timeclock-modeline-display): Define for byte-compiler.
Glenn Morris <rgm@gnu.org>
parents:
51263
diff
changeset
|
554 (list (floor seconds 65536) |
48facdb1558e
(display-time-hook, timeclock-modeline-display): Define for byte-compiler.
Glenn Morris <rgm@gnu.org>
parents:
51263
diff
changeset
|
555 (floor (mod seconds 65536)) |
48facdb1558e
(display-time-hook, timeclock-modeline-display): Define for byte-compiler.
Glenn Morris <rgm@gnu.org>
parents:
51263
diff
changeset
|
556 (floor (* (- seconds (ffloor seconds)) 1000000)))) |
48facdb1558e
(display-time-hook, timeclock-modeline-display): Define for byte-compiler.
Glenn Morris <rgm@gnu.org>
parents:
51263
diff
changeset
|
557 |
51861
91e4e5fd11de
(timeclock-use-display-time, timeclock-day-over-hook)
Glenn Morris <rgm@gnu.org>
parents:
51549
diff
changeset
|
558 ;; Should today-only be removed in favour of timeclock-relative? - gm |
33020 | 559 (defsubst timeclock-when-to-leave (&optional today-only) |
54704 | 560 "Return a time value representing the end of today's workday. |
30781 | 561 If TODAY-ONLY is non-nil, the value returned will be relative only to |
51861
91e4e5fd11de
(timeclock-use-display-time, timeclock-day-over-hook)
Glenn Morris <rgm@gnu.org>
parents:
51549
diff
changeset
|
562 the time worked today, and not to past time." |
30781 | 563 (timeclock-seconds-to-time |
564 (- (timeclock-time-to-seconds (current-time)) | |
37625
53351976477e
(timeclock-workday-remaining): Changed logic for determining how much
John Wiegley <johnw@newartisans.com>
parents:
37437
diff
changeset
|
565 (let ((discrep (timeclock-find-discrep))) |
53351976477e
(timeclock-workday-remaining): Changed logic for determining how much
John Wiegley <johnw@newartisans.com>
parents:
37437
diff
changeset
|
566 (if discrep |
53351976477e
(timeclock-workday-remaining): Changed logic for determining how much
John Wiegley <johnw@newartisans.com>
parents:
37437
diff
changeset
|
567 (if today-only |
53351976477e
(timeclock-workday-remaining): Changed logic for determining how much
John Wiegley <johnw@newartisans.com>
parents:
37437
diff
changeset
|
568 (cadr discrep) |
53351976477e
(timeclock-workday-remaining): Changed logic for determining how much
John Wiegley <johnw@newartisans.com>
parents:
37437
diff
changeset
|
569 (car discrep)) |
53351976477e
(timeclock-workday-remaining): Changed logic for determining how much
John Wiegley <johnw@newartisans.com>
parents:
37437
diff
changeset
|
570 0.0))))) |
30781 | 571 |
572 ;;;###autoload | |
573 (defun timeclock-when-to-leave-string (&optional show-seconds | |
574 today-only) | |
54704 | 575 "Return a string representing the end of today's workday. |
30781 | 576 This string is relative to the value of `timeclock-workday'. If |
51861
91e4e5fd11de
(timeclock-use-display-time, timeclock-day-over-hook)
Glenn Morris <rgm@gnu.org>
parents:
51549
diff
changeset
|
577 SHOW-SECONDS is non-nil, the value printed/returned will include |
91e4e5fd11de
(timeclock-use-display-time, timeclock-day-over-hook)
Glenn Morris <rgm@gnu.org>
parents:
51549
diff
changeset
|
578 seconds. If TODAY-ONLY is non-nil, the value returned will be |
91e4e5fd11de
(timeclock-use-display-time, timeclock-day-over-hook)
Glenn Morris <rgm@gnu.org>
parents:
51549
diff
changeset
|
579 relative only to the time worked today, and not to past time." |
91e4e5fd11de
(timeclock-use-display-time, timeclock-day-over-hook)
Glenn Morris <rgm@gnu.org>
parents:
51549
diff
changeset
|
580 ;; Should today-only be removed in favour of timeclock-relative? - gm |
30781 | 581 (interactive) |
582 (let* ((then (timeclock-when-to-leave today-only)) | |
583 (string | |
584 (if show-seconds | |
585 (format-time-string "%-I:%M:%S %p" then) | |
586 (format-time-string "%-I:%M %p" then)))) | |
587 (if (interactive-p) | |
65591
a65f8ec418fc
message format spec fixes, commit # 10
Deepak Goel <deego@gnufans.org>
parents:
64085
diff
changeset
|
588 (message "%s" string) |
30781 | 589 string))) |
590 | |
591 ;;; Internal Functions: | |
592 | |
593 (defvar timeclock-project-list nil) | |
594 (defvar timeclock-last-project nil) | |
595 | |
37324
570c667b4d1c
(timeclock-completing-read): new function.
John Wiegley <johnw@newartisans.com>
parents:
37282
diff
changeset
|
596 (defun timeclock-completing-read (prompt alist &optional default) |
570c667b4d1c
(timeclock-completing-read): new function.
John Wiegley <johnw@newartisans.com>
parents:
37282
diff
changeset
|
597 "A version of `completing-read' that works on both Emacs and XEmacs." |
570c667b4d1c
(timeclock-completing-read): new function.
John Wiegley <johnw@newartisans.com>
parents:
37282
diff
changeset
|
598 (if (featurep 'xemacs) |
570c667b4d1c
(timeclock-completing-read): new function.
John Wiegley <johnw@newartisans.com>
parents:
37282
diff
changeset
|
599 (let ((str (completing-read prompt alist))) |
570c667b4d1c
(timeclock-completing-read): new function.
John Wiegley <johnw@newartisans.com>
parents:
37282
diff
changeset
|
600 (if (or (null str) (= (length str) 0)) |
570c667b4d1c
(timeclock-completing-read): new function.
John Wiegley <johnw@newartisans.com>
parents:
37282
diff
changeset
|
601 default |
570c667b4d1c
(timeclock-completing-read): new function.
John Wiegley <johnw@newartisans.com>
parents:
37282
diff
changeset
|
602 str)) |
570c667b4d1c
(timeclock-completing-read): new function.
John Wiegley <johnw@newartisans.com>
parents:
37282
diff
changeset
|
603 (completing-read prompt alist nil nil nil nil default))) |
570c667b4d1c
(timeclock-completing-read): new function.
John Wiegley <johnw@newartisans.com>
parents:
37282
diff
changeset
|
604 |
30781 | 605 (defun timeclock-ask-for-project () |
606 "Ask the user for the project they are clocking into." | |
37324
570c667b4d1c
(timeclock-completing-read): new function.
John Wiegley <johnw@newartisans.com>
parents:
37282
diff
changeset
|
607 (timeclock-completing-read |
65680
ed770a0a7846
2005-09-24 Emilio C. Lopes <eclig@gmx.net>
Romain Francoise <romain@orebokech.com>
parents:
65591
diff
changeset
|
608 (format "Clock into which project (default %s): " |
37324
570c667b4d1c
(timeclock-completing-read): new function.
John Wiegley <johnw@newartisans.com>
parents:
37282
diff
changeset
|
609 (or timeclock-last-project |
570c667b4d1c
(timeclock-completing-read): new function.
John Wiegley <johnw@newartisans.com>
parents:
37282
diff
changeset
|
610 (car timeclock-project-list))) |
570c667b4d1c
(timeclock-completing-read): new function.
John Wiegley <johnw@newartisans.com>
parents:
37282
diff
changeset
|
611 (mapcar 'list timeclock-project-list) |
570c667b4d1c
(timeclock-completing-read): new function.
John Wiegley <johnw@newartisans.com>
parents:
37282
diff
changeset
|
612 (or timeclock-last-project |
570c667b4d1c
(timeclock-completing-read): new function.
John Wiegley <johnw@newartisans.com>
parents:
37282
diff
changeset
|
613 (car timeclock-project-list)))) |
30781 | 614 |
615 (defvar timeclock-reason-list nil) | |
616 | |
617 (defun timeclock-ask-for-reason () | |
618 "Ask the user for the reason they are clocking out." | |
37324
570c667b4d1c
(timeclock-completing-read): new function.
John Wiegley <johnw@newartisans.com>
parents:
37282
diff
changeset
|
619 (timeclock-completing-read "Reason for clocking out: " |
570c667b4d1c
(timeclock-completing-read): new function.
John Wiegley <johnw@newartisans.com>
parents:
37282
diff
changeset
|
620 (mapcar 'list timeclock-reason-list))) |
30781 | 621 |
622 (defun timeclock-update-modeline () | |
51861
91e4e5fd11de
(timeclock-use-display-time, timeclock-day-over-hook)
Glenn Morris <rgm@gnu.org>
parents:
51549
diff
changeset
|
623 "Update the `timeclock-mode-string' displayed in the modeline. |
91e4e5fd11de
(timeclock-use-display-time, timeclock-day-over-hook)
Glenn Morris <rgm@gnu.org>
parents:
51549
diff
changeset
|
624 The value of `timeclock-relative' affects the display as described in |
91e4e5fd11de
(timeclock-use-display-time, timeclock-day-over-hook)
Glenn Morris <rgm@gnu.org>
parents:
51549
diff
changeset
|
625 that variable's documentation." |
30781 | 626 (interactive) |
72331
4e0c58818901
(timeclock-use-elapsed): Added a new variable, which causes timeclock
John Wiegley <johnw@newartisans.com>
parents:
68721
diff
changeset
|
627 (let ((remainder |
4e0c58818901
(timeclock-use-elapsed): Added a new variable, which causes timeclock
John Wiegley <johnw@newartisans.com>
parents:
68721
diff
changeset
|
628 (if timeclock-use-elapsed |
4e0c58818901
(timeclock-use-elapsed): Added a new variable, which causes timeclock
John Wiegley <johnw@newartisans.com>
parents:
68721
diff
changeset
|
629 (timeclock-workday-elapsed) |
4e0c58818901
(timeclock-use-elapsed): Added a new variable, which causes timeclock
John Wiegley <johnw@newartisans.com>
parents:
68721
diff
changeset
|
630 (timeclock-workday-remaining (not timeclock-relative)))) |
51263 | 631 (last-in (equal (car timeclock-last-event) "i"))) |
30781 | 632 (when (and (< remainder 0) |
633 (not (and timeclock-day-over | |
634 (equal timeclock-day-over | |
635 (timeclock-time-to-date | |
636 (current-time)))))) | |
637 (setq timeclock-day-over | |
638 (timeclock-time-to-date (current-time))) | |
639 (run-hooks 'timeclock-day-over-hook)) | |
640 (setq timeclock-mode-string | |
51263 | 641 (propertize |
642 (format " %c%s%c " | |
643 (if last-in ?< ?[) | |
644 (timeclock-seconds-to-string remainder nil t) | |
645 (if last-in ?> ?])) | |
646 'help-echo "timeclock: time remaining")))) | |
647 | |
648 (put 'timeclock-mode-string 'risky-local-variable t) | |
30781 | 649 |
650 (defun timeclock-log (code &optional project) | |
651 "Log the event CODE to the timeclock log, at the time of call. | |
652 If PROJECT is a string, it represents the project which the event is | |
33020 | 653 being logged for. Normally only \"in\" events specify a project." |
654 (with-current-buffer (find-file-noselect timeclock-file) | |
30781 | 655 (goto-char (point-max)) |
656 (if (not (bolp)) | |
657 (insert "\n")) | |
658 (let ((now (current-time))) | |
659 (insert code " " | |
660 (format-time-string "%Y/%m/%d %H:%M:%S" now) | |
661 (or (and project | |
662 (stringp project) | |
663 (> (length project) 0) | |
664 (concat " " project)) | |
665 "") | |
666 "\n") | |
667 (if (equal (downcase code) "o") | |
668 (setq timeclock-last-period | |
669 (- (timeclock-time-to-seconds now) | |
670 (timeclock-time-to-seconds | |
671 (cadr timeclock-last-event))) | |
672 timeclock-discrepancy | |
673 (+ timeclock-discrepancy | |
674 timeclock-last-period))) | |
675 (setq timeclock-last-event (list code now project))) | |
676 (save-buffer) | |
33020 | 677 (run-hooks 'timeclock-event-hook) |
678 (kill-buffer (current-buffer)))) | |
30781 | 679 |
33020 | 680 (defvar timeclock-moment-regexp |
681 (concat "\\([bhioO]\\)\\s-+" | |
682 "\\([0-9]+\\)/\\([0-9]+\\)/\\([0-9]+\\)\\s-+" | |
683 "\\([0-9]+\\):\\([0-9]+\\):\\([0-9]+\\)[ \t]*" "\\([^\n]*\\)")) | |
684 | |
685 (defsubst timeclock-read-moment () | |
30781 | 686 "Read the moment under point from the timelog." |
33020 | 687 (if (looking-at timeclock-moment-regexp) |
688 (let ((code (match-string 1)) | |
689 (year (string-to-number (match-string 2))) | |
690 (mon (string-to-number (match-string 3))) | |
691 (mday (string-to-number (match-string 4))) | |
692 (hour (string-to-number (match-string 5))) | |
693 (min (string-to-number (match-string 6))) | |
694 (sec (string-to-number (match-string 7))) | |
695 (project (match-string 8))) | |
696 (list code (encode-time sec min hour mday mon year) project)))) | |
30781 | 697 |
698 (defun timeclock-last-period (&optional moment) | |
699 "Return the value of the last event period. | |
700 If the last event was a clock-in, the period will be open ended, and | |
701 growing every second. Otherwise, it is a fixed amount which has been | |
702 recorded to disk. If MOMENT is non-nil, use that as the current time. | |
703 This is only provided for coherency when used by | |
704 `timeclock-discrepancy'." | |
705 (if (equal (car timeclock-last-event) "i") | |
706 (- (timeclock-time-to-seconds (or moment (current-time))) | |
707 (timeclock-time-to-seconds | |
708 (cadr timeclock-last-event))) | |
709 timeclock-last-period)) | |
710 | |
33020 | 711 (defsubst timeclock-entry-length (entry) |
712 (- (timeclock-time-to-seconds (cadr entry)) | |
713 (timeclock-time-to-seconds (car entry)))) | |
714 | |
715 (defsubst timeclock-entry-begin (entry) | |
716 (car entry)) | |
717 | |
718 (defsubst timeclock-entry-end (entry) | |
719 (cadr entry)) | |
720 | |
721 (defsubst timeclock-entry-project (entry) | |
722 (nth 2 entry)) | |
723 | |
724 (defsubst timeclock-entry-comment (entry) | |
725 (nth 3 entry)) | |
726 | |
727 | |
728 (defsubst timeclock-entry-list-length (entry-list) | |
729 (let ((length 0)) | |
730 (while entry-list | |
731 (setq length (+ length (timeclock-entry-length (car entry-list)))) | |
732 (setq entry-list (cdr entry-list))) | |
733 length)) | |
734 | |
735 (defsubst timeclock-entry-list-begin (entry-list) | |
736 (timeclock-entry-begin (car entry-list))) | |
737 | |
738 (defsubst timeclock-entry-list-end (entry-list) | |
739 (timeclock-entry-end (car (last entry-list)))) | |
740 | |
741 (defsubst timeclock-entry-list-span (entry-list) | |
742 (- (timeclock-time-to-seconds (timeclock-entry-list-end entry-list)) | |
743 (timeclock-time-to-seconds (timeclock-entry-list-begin entry-list)))) | |
744 | |
745 (defsubst timeclock-entry-list-break (entry-list) | |
746 (- (timeclock-entry-list-span entry-list) | |
747 (timeclock-entry-list-length entry-list))) | |
748 | |
749 (defsubst timeclock-entry-list-projects (entry-list) | |
750 (let (projects) | |
751 (while entry-list | |
752 (let ((project (timeclock-entry-project (car entry-list)))) | |
753 (if projects | |
754 (add-to-list 'projects project) | |
755 (setq projects (list project)))) | |
756 (setq entry-list (cdr entry-list))) | |
757 projects)) | |
758 | |
759 | |
760 (defsubst timeclock-day-required (day) | |
37437
ed485de91fcf
(timeclock-day-required): If the time required for a particular day is
John Wiegley <johnw@newartisans.com>
parents:
37324
diff
changeset
|
761 (or (car day) timeclock-workday)) |
33020 | 762 |
763 (defsubst timeclock-day-length (day) | |
764 (timeclock-entry-list-length (cdr day))) | |
765 | |
766 (defsubst timeclock-day-debt (day) | |
767 (- (timeclock-day-required day) | |
768 (timeclock-day-length day))) | |
769 | |
770 (defsubst timeclock-day-begin (day) | |
771 (timeclock-entry-list-begin (cdr day))) | |
772 | |
773 (defsubst timeclock-day-end (day) | |
774 (timeclock-entry-list-end (cdr day))) | |
775 | |
776 (defsubst timeclock-day-span (day) | |
777 (timeclock-entry-list-span (cdr day))) | |
778 | |
779 (defsubst timeclock-day-break (day) | |
780 (timeclock-entry-list-break (cdr day))) | |
781 | |
782 (defsubst timeclock-day-projects (day) | |
783 (timeclock-entry-list-projects (cdr day))) | |
784 | |
785 (defmacro timeclock-day-list-template (func) | |
786 `(let ((length 0)) | |
787 (while day-list | |
788 (setq length (+ length (,(eval func) (car day-list)))) | |
789 (setq day-list (cdr day-list))) | |
790 length)) | |
791 | |
792 (defun timeclock-day-list-required (day-list) | |
793 (timeclock-day-list-template 'timeclock-day-required)) | |
794 | |
795 (defun timeclock-day-list-length (day-list) | |
796 (timeclock-day-list-template 'timeclock-day-length)) | |
797 | |
798 (defun timeclock-day-list-debt (day-list) | |
799 (timeclock-day-list-template 'timeclock-day-debt)) | |
800 | |
801 (defsubst timeclock-day-list-begin (day-list) | |
802 (timeclock-day-begin (car day-list))) | |
803 | |
804 (defsubst timeclock-day-list-end (day-list) | |
805 (timeclock-day-end (car (last day-list)))) | |
806 | |
807 (defun timeclock-day-list-span (day-list) | |
808 (timeclock-day-list-template 'timeclock-day-span)) | |
809 | |
810 (defun timeclock-day-list-break (day-list) | |
811 (timeclock-day-list-template 'timeclock-day-break)) | |
812 | |
813 (defun timeclock-day-list-projects (day-list) | |
814 (let (projects) | |
815 (while day-list | |
816 (let ((projs (timeclock-day-projects (car day-list)))) | |
817 (while projs | |
818 (if projects | |
819 (add-to-list 'projects (car projs)) | |
820 (setq projects (list (car projs)))) | |
821 (setq projs (cdr projs)))) | |
822 (setq day-list (cdr day-list))) | |
823 projects)) | |
824 | |
825 | |
826 (defsubst timeclock-current-debt (&optional log-data) | |
827 (nth 0 (or log-data (timeclock-log-data)))) | |
828 | |
829 (defsubst timeclock-day-alist (&optional log-data) | |
830 (nth 1 (or log-data (timeclock-log-data)))) | |
831 | |
832 (defun timeclock-day-list (&optional log-data) | |
833 (let ((alist (timeclock-day-alist log-data)) | |
834 day-list) | |
835 (while alist | |
836 (setq day-list (cons (cdar alist) day-list) | |
837 alist (cdr alist))) | |
838 day-list)) | |
839 | |
840 (defsubst timeclock-project-alist (&optional log-data) | |
841 (nth 2 (or log-data (timeclock-log-data)))) | |
842 | |
843 | |
844 (defun timeclock-log-data (&optional recent-only filename) | |
845 "Return the contents of the timelog file, in a useful format. | |
51861
91e4e5fd11de
(timeclock-use-display-time, timeclock-day-over-hook)
Glenn Morris <rgm@gnu.org>
parents:
51549
diff
changeset
|
846 If the optional argument RECENT-ONLY is non-nil, only show the contents |
91e4e5fd11de
(timeclock-use-display-time, timeclock-day-over-hook)
Glenn Morris <rgm@gnu.org>
parents:
51549
diff
changeset
|
847 from the last point where the time debt (see below) was set. |
91e4e5fd11de
(timeclock-use-display-time, timeclock-day-over-hook)
Glenn Morris <rgm@gnu.org>
parents:
51549
diff
changeset
|
848 If the optional argument FILENAME is non-nil, it is used instead of |
91e4e5fd11de
(timeclock-use-display-time, timeclock-day-over-hook)
Glenn Morris <rgm@gnu.org>
parents:
51549
diff
changeset
|
849 the file specified by `timeclock-file.' |
91e4e5fd11de
(timeclock-use-display-time, timeclock-day-over-hook)
Glenn Morris <rgm@gnu.org>
parents:
51549
diff
changeset
|
850 |
33020 | 851 A timelog contains data in the form of a single entry per line. |
852 Each entry has the form: | |
853 | |
854 CODE YYYY/MM/DD HH:MM:SS [COMMENT] | |
855 | |
856 CODE is one of: b, h, i, o or O. COMMENT is optional when the code is | |
857 i, o or O. The meanings of the codes are: | |
858 | |
859 b Set the current time balance, or \"time debt\". Useful when | |
860 archiving old log data, when a debt must be carried forward. | |
861 The COMMENT here is the number of seconds of debt. | |
862 | |
863 h Set the required working time for the given day. This must | |
864 be the first entry for that day. The COMMENT in this case is | |
54704 | 865 the number of hours in this workday. Floating point amounts |
866 are allowed. | |
33020 | 867 |
868 i Clock in. The COMMENT in this case should be the name of the | |
869 project worked on. | |
870 | |
871 o Clock out. COMMENT is unnecessary, but can be used to provide | |
872 a description of how the period went, for example. | |
873 | |
874 O Final clock out. Whatever project was being worked on, it is | |
875 now finished. Useful for creating summary reports. | |
876 | |
877 When this function is called, it will return a data structure with the | |
878 following format: | |
879 | |
880 (DEBT ENTRIES-BY-DAY ENTRIES-BY-PROJECT) | |
881 | |
882 DEBT is a floating point number representing the number of seconds | |
883 \"owed\" before any work was done. For a new file (one without a 'b' | |
884 entry), this is always zero. | |
885 | |
886 The two entries lists have similar formats. They are both alists, | |
887 where the CAR is the index, and the CDR is a list of time entries. | |
888 For ENTRIES-BY-DAY, the CAR is a textual date string, of the form | |
889 YYYY/MM/DD. For ENTRIES-BY-PROJECT, it is the name of the project | |
890 worked on, or t for the default project. | |
891 | |
892 The CDR for ENTRIES-BY-DAY is slightly different than for | |
893 ENTRIES-BY-PROJECT. It has the following form: | |
894 | |
895 (DAY-LENGTH TIME-ENTRIES...) | |
896 | |
897 For ENTRIES-BY-PROJECT, there is no DAY-LENGTH member. It is simply a | |
898 list of TIME-ENTRIES. Note that if DAY-LENGTH is nil, it means | |
899 whatever is the default should be used. | |
900 | |
901 A TIME-ENTRY is a recorded time interval. It has the following format | |
902 \(although generally one does not have to manipulate these entries | |
903 directly; see below): | |
904 | |
905 (BEGIN-TIME END-TIME PROJECT [COMMENT] [FINAL-P]) | |
906 | |
907 Anyway, suffice it to say there are a lot of structures. Typically | |
908 the user is expected to manipulate to the day(s) or project(s) that he | |
909 or she wants, at which point the following helper functions may be | |
910 used: | |
911 | |
912 timeclock-day-required | |
913 timeclock-day-length | |
914 timeclock-day-debt | |
915 timeclock-day-begin | |
916 timeclock-day-end | |
917 timeclock-day-span | |
918 timeclock-day-break | |
919 timeclock-day-projects | |
920 | |
921 timeclock-day-list-required | |
922 timeclock-day-list-length | |
923 timeclock-day-list-debt | |
924 timeclock-day-list-begin | |
925 timeclock-day-list-end | |
926 timeclock-day-list-span | |
927 timeclock-day-list-break | |
928 timeclock-day-list-projects | |
929 | |
930 timeclock-entry-length | |
931 timeclock-entry-begin | |
932 timeclock-entry-end | |
933 timeclock-entry-project | |
934 timeclock-entry-comment | |
935 | |
936 timeclock-entry-list-length | |
937 timeclock-entry-list-begin | |
938 timeclock-entry-list-end | |
939 timeclock-entry-list-span | |
940 timeclock-entry-list-break | |
941 timeclock-entry-list-projects | |
942 | |
943 A few comments should make the use of the above functions obvious: | |
944 | |
945 `required' is the amount of time that must be spent during a day, or | |
946 sequence of days, in order to have no debt. | |
947 | |
948 `length' is the actual amount of time that was spent. | |
949 | |
950 `debt' is the difference between required time and length. A | |
951 negative debt signifies overtime. | |
952 | |
953 `begin' is the earliest moment at which work began. | |
954 | |
955 `end' is the final moment work was done. | |
956 | |
957 `span' is the difference between begin and end. | |
958 | |
959 `break' is the difference between span and length. | |
960 | |
961 `project' is the project that was worked on, and `projects' is a | |
962 list of all the projects that were worked on during a given period. | |
963 | |
964 `comment', where it applies, could mean anything. | |
965 | |
966 There are a few more functions available, for locating day and entry | |
967 lists: | |
968 | |
969 timeclock-day-alist LOG-DATA | |
970 timeclock-project-alist LOG-DATA | |
971 timeclock-current-debt LOG-DATA | |
972 | |
973 See the documentation for the given function if more info is needed." | |
974 (let* ((log-data (list 0.0 nil nil)) | |
975 (now (current-time)) | |
976 (todays-date (timeclock-time-to-date now)) | |
977 last-date-limited last-date-seconds last-date | |
36851 | 978 (line 0) last beg day entry event) |
33020 | 979 (with-temp-buffer |
980 (insert-file-contents (or filename timeclock-file)) | |
981 (when recent-only | |
982 (goto-char (point-max)) | |
983 (unless (re-search-backward "^b\\s-+" nil t) | |
984 (goto-char (point-min)))) | |
985 (while (or (setq event (timeclock-read-moment)) | |
986 (and beg (not last) | |
987 (setq last t event (list "o" now)))) | |
988 (setq line (1+ line)) | |
989 (cond ((equal (car event) "b") | |
990 (setcar log-data (string-to-number (nth 2 event)))) | |
991 ((equal (car event) "h") | |
992 (setq last-date-limited (timeclock-time-to-date (cadr event)) | |
993 last-date-seconds (* (string-to-number (nth 2 event)) | |
994 3600.0))) | |
995 ((equal (car event) "i") | |
996 (if beg | |
997 (error "Error in format of timelog file, line %d" line) | |
998 (setq beg t)) | |
999 (setq entry (list (cadr event) nil | |
1000 (and (> (length (nth 2 event)) 0) | |
1001 (nth 2 event)))) | |
1002 (let ((date (timeclock-time-to-date (cadr event)))) | |
1003 (if (and last-date | |
1004 (not (equal date last-date))) | |
36851 | 1005 (progn |
1006 (setcar (cdr log-data) | |
1007 (cons (cons last-date day) | |
1008 (cadr log-data))) | |
1009 (setq day (list (and last-date-limited | |
1010 last-date-seconds)))) | |
1011 (unless day | |
1012 (setq day (list (and last-date-limited | |
1013 last-date-seconds))))) | |
33020 | 1014 (setq last-date date |
1015 last-date-limited nil))) | |
1016 ((equal (downcase (car event)) "o") | |
1017 (if (not beg) | |
1018 (error "Error in format of timelog file, line %d" line) | |
1019 (setq beg nil)) | |
1020 (setcar (cdr entry) (cadr event)) | |
1021 (let ((desc (and (> (length (nth 2 event)) 0) | |
1022 (nth 2 event)))) | |
1023 (if desc | |
1024 (nconc entry (list (nth 2 event)))) | |
1025 (if (equal (car event) "O") | |
1026 (nconc entry (if desc | |
1027 (list t) | |
1028 (list nil t)))) | |
1029 (nconc day (list entry)) | |
1030 (setq desc (nth 2 entry)) | |
1031 (let ((proj (assoc desc (nth 2 log-data)))) | |
36851 | 1032 (if (null proj) |
33020 | 1033 (setcar (cddr log-data) |
1034 (cons (cons desc (list entry)) | |
1035 (car (cddr log-data)))) | |
1036 (nconc (cdr proj) (list entry))))))) | |
1037 (forward-line)) | |
1038 (if day | |
1039 (setcar (cdr log-data) | |
1040 (cons (cons last-date day) | |
1041 (cadr log-data)))) | |
1042 log-data))) | |
1043 | |
37625
53351976477e
(timeclock-workday-remaining): Changed logic for determining how much
John Wiegley <johnw@newartisans.com>
parents:
37437
diff
changeset
|
1044 (defun timeclock-find-discrep () |
51861
91e4e5fd11de
(timeclock-use-display-time, timeclock-day-over-hook)
Glenn Morris <rgm@gnu.org>
parents:
51549
diff
changeset
|
1045 "Calculate time discrepancies, in seconds. |
91e4e5fd11de
(timeclock-use-display-time, timeclock-day-over-hook)
Glenn Morris <rgm@gnu.org>
parents:
51549
diff
changeset
|
1046 The result is a three element list, containing the total time |
91e4e5fd11de
(timeclock-use-display-time, timeclock-day-over-hook)
Glenn Morris <rgm@gnu.org>
parents:
51549
diff
changeset
|
1047 discrepancy, today's discrepancy, and the time worked today." |
33020 | 1048 ;; This is not implemented in terms of the functions above, because |
1049 ;; it's a bit wasteful to read all of that data in, just to throw | |
1050 ;; away more than 90% of the information afterwards. | |
37437
ed485de91fcf
(timeclock-day-required): If the time required for a particular day is
John Wiegley <johnw@newartisans.com>
parents:
37324
diff
changeset
|
1051 ;; |
ed485de91fcf
(timeclock-day-required): If the time required for a particular day is
John Wiegley <johnw@newartisans.com>
parents:
37324
diff
changeset
|
1052 ;; If it were implemented using those functions, it would look |
ed485de91fcf
(timeclock-day-required): If the time required for a particular day is
John Wiegley <johnw@newartisans.com>
parents:
37324
diff
changeset
|
1053 ;; something like this: |
ed485de91fcf
(timeclock-day-required): If the time required for a particular day is
John Wiegley <johnw@newartisans.com>
parents:
37324
diff
changeset
|
1054 ;; (let ((days (timeclock-day-alist (timeclock-log-data))) |
ed485de91fcf
(timeclock-day-required): If the time required for a particular day is
John Wiegley <johnw@newartisans.com>
parents:
37324
diff
changeset
|
1055 ;; (total 0.0)) |
ed485de91fcf
(timeclock-day-required): If the time required for a particular day is
John Wiegley <johnw@newartisans.com>
parents:
37324
diff
changeset
|
1056 ;; (while days |
ed485de91fcf
(timeclock-day-required): If the time required for a particular day is
John Wiegley <johnw@newartisans.com>
parents:
37324
diff
changeset
|
1057 ;; (setq total (+ total (- (timeclock-day-length (cdar days)) |
ed485de91fcf
(timeclock-day-required): If the time required for a particular day is
John Wiegley <johnw@newartisans.com>
parents:
37324
diff
changeset
|
1058 ;; (timeclock-day-required (cdar days)))) |
ed485de91fcf
(timeclock-day-required): If the time required for a particular day is
John Wiegley <johnw@newartisans.com>
parents:
37324
diff
changeset
|
1059 ;; days (cdr days))) |
ed485de91fcf
(timeclock-day-required): If the time required for a particular day is
John Wiegley <johnw@newartisans.com>
parents:
37324
diff
changeset
|
1060 ;; total) |
ed485de91fcf
(timeclock-day-required): If the time required for a particular day is
John Wiegley <johnw@newartisans.com>
parents:
37324
diff
changeset
|
1061 (let* ((now (current-time)) |
ed485de91fcf
(timeclock-day-required): If the time required for a particular day is
John Wiegley <johnw@newartisans.com>
parents:
37324
diff
changeset
|
1062 (todays-date (timeclock-time-to-date now)) |
37648
9baaf32f355a
(timeclock-find-discrep): Initialize `elapsed' to 0.
John Wiegley <johnw@newartisans.com>
parents:
37625
diff
changeset
|
1063 (first t) (accum 0) (elapsed 0) |
37437
ed485de91fcf
(timeclock-day-required): If the time required for a particular day is
John Wiegley <johnw@newartisans.com>
parents:
37324
diff
changeset
|
1064 event beg last-date avg |
ed485de91fcf
(timeclock-day-required): If the time required for a particular day is
John Wiegley <johnw@newartisans.com>
parents:
37324
diff
changeset
|
1065 last-date-limited last-date-seconds) |
ed485de91fcf
(timeclock-day-required): If the time required for a particular day is
John Wiegley <johnw@newartisans.com>
parents:
37324
diff
changeset
|
1066 (unless timeclock-discrepancy |
ed485de91fcf
(timeclock-day-required): If the time required for a particular day is
John Wiegley <johnw@newartisans.com>
parents:
37324
diff
changeset
|
1067 (when (file-readable-p timeclock-file) |
36851 | 1068 (setq timeclock-project-list nil |
1069 timeclock-last-project nil | |
1070 timeclock-reason-list nil | |
1071 timeclock-elapsed 0) | |
1072 (with-temp-buffer | |
1073 (insert-file-contents timeclock-file) | |
1074 (goto-char (point-max)) | |
1075 (unless (re-search-backward "^b\\s-+" nil t) | |
1076 (goto-char (point-min))) | |
1077 (while (setq event (timeclock-read-moment)) | |
1078 (cond ((equal (car event) "b") | |
1079 (setq accum (string-to-number (nth 2 event)))) | |
1080 ((equal (car event) "h") | |
1081 (setq last-date-limited | |
1082 (timeclock-time-to-date (cadr event)) | |
1083 last-date-seconds | |
1084 (* (string-to-number (nth 2 event)) 3600.0))) | |
1085 ((equal (car event) "i") | |
1086 (when (and (nth 2 event) | |
1087 (> (length (nth 2 event)) 0)) | |
1088 (add-to-list 'timeclock-project-list (nth 2 event)) | |
1089 (setq timeclock-last-project (nth 2 event))) | |
1090 (let ((date (timeclock-time-to-date (cadr event)))) | |
37625
53351976477e
(timeclock-workday-remaining): Changed logic for determining how much
John Wiegley <johnw@newartisans.com>
parents:
37437
diff
changeset
|
1091 (if (if last-date |
53351976477e
(timeclock-workday-remaining): Changed logic for determining how much
John Wiegley <johnw@newartisans.com>
parents:
37437
diff
changeset
|
1092 (not (equal date last-date)) |
53351976477e
(timeclock-workday-remaining): Changed logic for determining how much
John Wiegley <johnw@newartisans.com>
parents:
37437
diff
changeset
|
1093 first) |
36851 | 1094 (setq first nil |
37625
53351976477e
(timeclock-workday-remaining): Changed logic for determining how much
John Wiegley <johnw@newartisans.com>
parents:
37437
diff
changeset
|
1095 accum (- accum (if last-date-limited |
53351976477e
(timeclock-workday-remaining): Changed logic for determining how much
John Wiegley <johnw@newartisans.com>
parents:
37437
diff
changeset
|
1096 last-date-seconds |
53351976477e
(timeclock-workday-remaining): Changed logic for determining how much
John Wiegley <johnw@newartisans.com>
parents:
37437
diff
changeset
|
1097 timeclock-workday)))) |
36851 | 1098 (setq last-date date |
1099 last-date-limited nil) | |
1100 (if beg | |
1101 (error "Error in format of timelog file!") | |
1102 (setq beg (timeclock-time-to-seconds (cadr event)))))) | |
1103 ((equal (downcase (car event)) "o") | |
1104 (if (and (nth 2 event) | |
30781 | 1105 (> (length (nth 2 event)) 0)) |
36851 | 1106 (add-to-list 'timeclock-reason-list (nth 2 event))) |
37625
53351976477e
(timeclock-workday-remaining): Changed logic for determining how much
John Wiegley <johnw@newartisans.com>
parents:
37437
diff
changeset
|
1107 (if (not beg) |
53351976477e
(timeclock-workday-remaining): Changed logic for determining how much
John Wiegley <johnw@newartisans.com>
parents:
37437
diff
changeset
|
1108 (error "Error in format of timelog file!") |
53351976477e
(timeclock-workday-remaining): Changed logic for determining how much
John Wiegley <johnw@newartisans.com>
parents:
37437
diff
changeset
|
1109 (setq timeclock-last-period |
53351976477e
(timeclock-workday-remaining): Changed logic for determining how much
John Wiegley <johnw@newartisans.com>
parents:
37437
diff
changeset
|
1110 (- (timeclock-time-to-seconds (cadr event)) beg) |
53351976477e
(timeclock-workday-remaining): Changed logic for determining how much
John Wiegley <johnw@newartisans.com>
parents:
37437
diff
changeset
|
1111 accum (+ timeclock-last-period accum) |
53351976477e
(timeclock-workday-remaining): Changed logic for determining how much
John Wiegley <johnw@newartisans.com>
parents:
37437
diff
changeset
|
1112 beg nil)) |
36851 | 1113 (if (equal last-date todays-date) |
1114 (setq timeclock-elapsed | |
1115 (+ timeclock-last-period timeclock-elapsed))))) | |
1116 (setq timeclock-last-event event | |
1117 timeclock-last-event-workday | |
37437
ed485de91fcf
(timeclock-day-required): If the time required for a particular day is
John Wiegley <johnw@newartisans.com>
parents:
37324
diff
changeset
|
1118 (if (equal (timeclock-time-to-date now) last-date-limited) |
36851 | 1119 last-date-seconds |
1120 timeclock-workday)) | |
1121 (forward-line)) | |
37437
ed485de91fcf
(timeclock-day-required): If the time required for a particular day is
John Wiegley <johnw@newartisans.com>
parents:
37324
diff
changeset
|
1122 (setq timeclock-discrepancy accum)))) |
37650
061ef023b0af
(timeclock-find-discrep): Set `timeclock-last-event-workday' if it's
John Wiegley <johnw@newartisans.com>
parents:
37648
diff
changeset
|
1123 (unless timeclock-last-event-workday |
061ef023b0af
(timeclock-find-discrep): Set `timeclock-last-event-workday' if it's
John Wiegley <johnw@newartisans.com>
parents:
37648
diff
changeset
|
1124 (setq timeclock-last-event-workday timeclock-workday)) |
51263 | 1125 (setq accum (or timeclock-discrepancy 0) |
37652
7fb1a7ce4a40
One more variable coming up nil on the first time around, needing
John Wiegley <johnw@newartisans.com>
parents:
37651
diff
changeset
|
1126 elapsed (or timeclock-elapsed elapsed)) |
37437
ed485de91fcf
(timeclock-day-required): If the time required for a particular day is
John Wiegley <johnw@newartisans.com>
parents:
37324
diff
changeset
|
1127 (if timeclock-last-event |
ed485de91fcf
(timeclock-day-required): If the time required for a particular day is
John Wiegley <johnw@newartisans.com>
parents:
37324
diff
changeset
|
1128 (if (equal (car timeclock-last-event) "i") |
37625
53351976477e
(timeclock-workday-remaining): Changed logic for determining how much
John Wiegley <johnw@newartisans.com>
parents:
37437
diff
changeset
|
1129 (let ((last-period (timeclock-last-period now))) |
53351976477e
(timeclock-workday-remaining): Changed logic for determining how much
John Wiegley <johnw@newartisans.com>
parents:
37437
diff
changeset
|
1130 (setq accum (+ accum last-period) |
53351976477e
(timeclock-workday-remaining): Changed logic for determining how much
John Wiegley <johnw@newartisans.com>
parents:
37437
diff
changeset
|
1131 elapsed (+ elapsed last-period))) |
37437
ed485de91fcf
(timeclock-day-required): If the time required for a particular day is
John Wiegley <johnw@newartisans.com>
parents:
37324
diff
changeset
|
1132 (if (not (equal (timeclock-time-to-date |
ed485de91fcf
(timeclock-day-required): If the time required for a particular day is
John Wiegley <johnw@newartisans.com>
parents:
37324
diff
changeset
|
1133 (cadr timeclock-last-event)) |
ed485de91fcf
(timeclock-day-required): If the time required for a particular day is
John Wiegley <johnw@newartisans.com>
parents:
37324
diff
changeset
|
1134 (timeclock-time-to-date now))) |
ed485de91fcf
(timeclock-day-required): If the time required for a particular day is
John Wiegley <johnw@newartisans.com>
parents:
37324
diff
changeset
|
1135 (setq accum (- accum timeclock-last-event-workday))))) |
37625
53351976477e
(timeclock-workday-remaining): Changed logic for determining how much
John Wiegley <johnw@newartisans.com>
parents:
37437
diff
changeset
|
1136 (list accum (- elapsed timeclock-last-event-workday) |
53351976477e
(timeclock-workday-remaining): Changed logic for determining how much
John Wiegley <johnw@newartisans.com>
parents:
37437
diff
changeset
|
1137 elapsed))) |
36851 | 1138 |
1139 ;;; A reporting function that uses timeclock-log-data | |
1140 | |
1141 (defun timeclock-day-base (&optional time) | |
51861
91e4e5fd11de
(timeclock-use-display-time, timeclock-day-over-hook)
Glenn Morris <rgm@gnu.org>
parents:
51549
diff
changeset
|
1142 "Given a time within a day, return 0:0:0 within that day. |
91e4e5fd11de
(timeclock-use-display-time, timeclock-day-over-hook)
Glenn Morris <rgm@gnu.org>
parents:
51549
diff
changeset
|
1143 If optional argument TIME is non-nil, use that instead of the current time." |
36851 | 1144 (let ((decoded (decode-time (or time (current-time))))) |
1145 (setcar (nthcdr 0 decoded) 0) | |
1146 (setcar (nthcdr 1 decoded) 0) | |
1147 (setcar (nthcdr 2 decoded) 0) | |
1148 (apply 'encode-time decoded))) | |
1149 | |
1150 (defun timeclock-geometric-mean (l) | |
54704 | 1151 "Compute the geometric mean of the values in the list L." |
36851 | 1152 (let ((total 0) |
1153 (count 0)) | |
1154 (while l | |
1155 (setq total (+ total (car l)) | |
1156 count (1+ count) | |
1157 l (cdr l))) | |
1158 (if (> count 0) | |
1159 (/ total count) | |
1160 0))) | |
1161 | |
1162 (defun timeclock-generate-report (&optional html-p) | |
51861
91e4e5fd11de
(timeclock-use-display-time, timeclock-day-over-hook)
Glenn Morris <rgm@gnu.org>
parents:
51549
diff
changeset
|
1163 "Generate a summary report based on the current timelog file. |
91e4e5fd11de
(timeclock-use-display-time, timeclock-day-over-hook)
Glenn Morris <rgm@gnu.org>
parents:
51549
diff
changeset
|
1164 By default, the report is in plain text, but if the optional argument |
54704 | 1165 HTML-P is non-nil, HTML markup is added." |
36851 | 1166 (interactive) |
1167 (let ((log (timeclock-log-data)) | |
1168 (today (timeclock-day-base))) | |
1169 (if html-p (insert "<p>")) | |
1170 (insert "Currently ") | |
1171 (let ((project (nth 2 timeclock-last-event)) | |
1172 (begin (nth 1 timeclock-last-event)) | |
1173 done) | |
1174 (if (timeclock-currently-in-p) | |
1175 (insert "IN") | |
1176 (if (or (null project) (= (length project) 0)) | |
1177 (progn (insert "Done Working Today") | |
1178 (setq done t)) | |
1179 (insert "OUT"))) | |
1180 (unless done | |
1181 (insert " since " (format-time-string "%Y/%m/%d %-I:%M %p" begin)) | |
1182 (if html-p | |
1183 (insert "<br>\n<b>") | |
1184 (insert "\n*")) | |
1185 (if (timeclock-currently-in-p) | |
1186 (insert "Working on ")) | |
1187 (if html-p | |
37282
d30baa39a3b4
(timeclock-generate-report): Added a missing insert of the project
John Wiegley <johnw@newartisans.com>
parents:
36854
diff
changeset
|
1188 (insert project "</b><br>\n") |
36851 | 1189 (insert project "*\n")) |
1190 (let ((proj-data (cdr (assoc project (timeclock-project-alist log)))) | |
1191 (two-weeks-ago (timeclock-seconds-to-time | |
1192 (- (timeclock-time-to-seconds today) | |
1193 (* 2 7 24 60 60)))) | |
1194 two-week-len today-len) | |
1195 (while proj-data | |
55207
a3244da8e396
(timeclock-time-less-p): Remove.
Juanma Barranquero <lekktu@gmail.com>
parents:
54704
diff
changeset
|
1196 (if (not (time-less-p |
36851 | 1197 (timeclock-entry-begin (car proj-data)) today)) |
1198 (setq today-len (timeclock-entry-list-length proj-data) | |
1199 proj-data nil) | |
1200 (if (and (null two-week-len) | |
55207
a3244da8e396
(timeclock-time-less-p): Remove.
Juanma Barranquero <lekktu@gmail.com>
parents:
54704
diff
changeset
|
1201 (not (time-less-p |
36851 | 1202 (timeclock-entry-begin (car proj-data)) |
1203 two-weeks-ago))) | |
1204 (setq two-week-len (timeclock-entry-list-length proj-data))) | |
1205 (setq proj-data (cdr proj-data)))) | |
1206 (if (null two-week-len) | |
1207 (setq two-week-len today-len)) | |
1208 (if html-p (insert "<p>")) | |
37437
ed485de91fcf
(timeclock-day-required): If the time required for a particular day is
John Wiegley <johnw@newartisans.com>
parents:
37324
diff
changeset
|
1209 (if today-len |
ed485de91fcf
(timeclock-day-required): If the time required for a particular day is
John Wiegley <johnw@newartisans.com>
parents:
37324
diff
changeset
|
1210 (insert "\nTime spent on this task today: " |
ed485de91fcf
(timeclock-day-required): If the time required for a particular day is
John Wiegley <johnw@newartisans.com>
parents:
37324
diff
changeset
|
1211 (timeclock-seconds-to-string today-len) |
ed485de91fcf
(timeclock-day-required): If the time required for a particular day is
John Wiegley <johnw@newartisans.com>
parents:
37324
diff
changeset
|
1212 ". In the last two weeks: " |
ed485de91fcf
(timeclock-day-required): If the time required for a particular day is
John Wiegley <johnw@newartisans.com>
parents:
37324
diff
changeset
|
1213 (timeclock-seconds-to-string two-week-len)) |
ed485de91fcf
(timeclock-day-required): If the time required for a particular day is
John Wiegley <johnw@newartisans.com>
parents:
37324
diff
changeset
|
1214 (if two-week-len |
ed485de91fcf
(timeclock-day-required): If the time required for a particular day is
John Wiegley <johnw@newartisans.com>
parents:
37324
diff
changeset
|
1215 (insert "\nTime spent on this task in the last two weeks: " |
ed485de91fcf
(timeclock-day-required): If the time required for a particular day is
John Wiegley <johnw@newartisans.com>
parents:
37324
diff
changeset
|
1216 (timeclock-seconds-to-string two-week-len)))) |
36851 | 1217 (if html-p (insert "<br>")) |
1218 (insert "\n" | |
1219 (timeclock-seconds-to-string (timeclock-workday-elapsed)) | |
1220 " worked today, " | |
1221 (timeclock-seconds-to-string (timeclock-workday-remaining)) | |
1222 " remaining, done at " | |
1223 (timeclock-when-to-leave-string) "\n"))) | |
1224 (if html-p (insert "<p>")) | |
1225 (insert "\nThere have been " | |
1226 (number-to-string | |
1227 (length (timeclock-day-alist log))) | |
1228 " days of activity, starting " | |
1229 (caar (last (timeclock-day-alist log)))) | |
1230 (if html-p (insert "</p>")) | |
1231 (when html-p | |
1232 (insert "<p> | |
1233 <table> | |
1234 <td width=\"25\"><br></td><td> | |
1235 <table border=1 cellpadding=3> | |
1236 <tr><th><i>Statistics</i></th> | |
1237 <th>Entire</th> | |
1238 <th>-30 days</th> | |
1239 <th>-3 mons</th> | |
1240 <th>-6 mons</th> | |
1241 <th>-1 year</th> | |
1242 </tr>") | |
1243 (let* ((day-list (timeclock-day-list)) | |
1244 (thirty-days-ago (timeclock-seconds-to-time | |
1245 (- (timeclock-time-to-seconds today) | |
1246 (* 30 24 60 60)))) | |
1247 (three-months-ago (timeclock-seconds-to-time | |
1248 (- (timeclock-time-to-seconds today) | |
1249 (* 90 24 60 60)))) | |
1250 (six-months-ago (timeclock-seconds-to-time | |
1251 (- (timeclock-time-to-seconds today) | |
1252 (* 180 24 60 60)))) | |
1253 (one-year-ago (timeclock-seconds-to-time | |
1254 (- (timeclock-time-to-seconds today) | |
1255 (* 365 24 60 60)))) | |
1256 (time-in (vector (list t) (list t) (list t) (list t) (list t))) | |
1257 (time-out (vector (list t) (list t) (list t) (list t) (list t))) | |
1258 (breaks (vector (list t) (list t) (list t) (list t) (list t))) | |
1259 (workday (vector (list t) (list t) (list t) (list t) (list t))) | |
1260 (lengths (vector '(0 0) thirty-days-ago three-months-ago | |
1261 six-months-ago one-year-ago))) | |
1262 ;; collect statistics from complete timelog | |
1263 (while day-list | |
1264 (let ((i 0) (l 5)) | |
1265 (while (< i l) | |
55207
a3244da8e396
(timeclock-time-less-p): Remove.
Juanma Barranquero <lekktu@gmail.com>
parents:
54704
diff
changeset
|
1266 (unless (time-less-p |
36851 | 1267 (timeclock-day-begin (car day-list)) |
1268 (aref lengths i)) | |
1269 (let ((base (timeclock-time-to-seconds | |
1270 (timeclock-day-base | |
1271 (timeclock-day-begin (car day-list)))))) | |
1272 (nconc (aref time-in i) | |
1273 (list (- (timeclock-time-to-seconds | |
1274 (timeclock-day-begin (car day-list))) | |
1275 base))) | |
1276 (let ((span (timeclock-day-span (car day-list))) | |
1277 (len (timeclock-day-length (car day-list))) | |
1278 (req (timeclock-day-required (car day-list)))) | |
1279 ;; If the day's actual work length is less than | |
1280 ;; 70% of its span, then likely the exit time | |
1281 ;; and break amount are not worthwhile adding to | |
1282 ;; the statistic | |
1283 (when (and (> span 0) | |
1284 (> (/ (float len) (float span)) 0.70)) | |
1285 (nconc (aref time-out i) | |
1286 (list (- (timeclock-time-to-seconds | |
1287 (timeclock-day-end (car day-list))) | |
1288 base))) | |
1289 (nconc (aref breaks i) (list (- span len)))) | |
1290 (if req | |
1291 (setq len (+ len (- timeclock-workday req)))) | |
1292 (nconc (aref workday i) (list len))))) | |
1293 (setq i (1+ i)))) | |
1294 (setq day-list (cdr day-list))) | |
1295 ;; average statistics | |
1296 (let ((i 0) (l 5)) | |
1297 (while (< i l) | |
1298 (aset time-in i (timeclock-geometric-mean | |
1299 (cdr (aref time-in i)))) | |
1300 (aset time-out i (timeclock-geometric-mean | |
1301 (cdr (aref time-out i)))) | |
1302 (aset breaks i (timeclock-geometric-mean | |
1303 (cdr (aref breaks i)))) | |
1304 (aset workday i (timeclock-geometric-mean | |
1305 (cdr (aref workday i)))) | |
1306 (setq i (1+ i)))) | |
1307 ;; Output the HTML table | |
1308 (insert "<tr>\n") | |
1309 (insert "<td align=\"center\">Time in</td>\n") | |
1310 (let ((i 0) (l 5)) | |
1311 (while (< i l) | |
1312 (insert "<td align=\"right\">" | |
1313 (timeclock-seconds-to-string (aref time-in i)) | |
1314 "</td>\n") | |
1315 (setq i (1+ i)))) | |
1316 (insert "</tr>\n") | |
37437
ed485de91fcf
(timeclock-day-required): If the time required for a particular day is
John Wiegley <johnw@newartisans.com>
parents:
37324
diff
changeset
|
1317 |
36851 | 1318 (insert "<tr>\n") |
1319 (insert "<td align=\"center\">Time out</td>\n") | |
1320 (let ((i 0) (l 5)) | |
1321 (while (< i l) | |
1322 (insert "<td align=\"right\">" | |
1323 (timeclock-seconds-to-string (aref time-out i)) | |
1324 "</td>\n") | |
1325 (setq i (1+ i)))) | |
1326 (insert "</tr>\n") | |
37437
ed485de91fcf
(timeclock-day-required): If the time required for a particular day is
John Wiegley <johnw@newartisans.com>
parents:
37324
diff
changeset
|
1327 |
36851 | 1328 (insert "<tr>\n") |
1329 (insert "<td align=\"center\">Break</td>\n") | |
1330 (let ((i 0) (l 5)) | |
1331 (while (< i l) | |
1332 (insert "<td align=\"right\">" | |
1333 (timeclock-seconds-to-string (aref breaks i)) | |
1334 "</td>\n") | |
1335 (setq i (1+ i)))) | |
1336 (insert "</tr>\n") | |
37437
ed485de91fcf
(timeclock-day-required): If the time required for a particular day is
John Wiegley <johnw@newartisans.com>
parents:
37324
diff
changeset
|
1337 |
36851 | 1338 (insert "<tr>\n") |
1339 (insert "<td align=\"center\">Workday</td>\n") | |
1340 (let ((i 0) (l 5)) | |
1341 (while (< i l) | |
1342 (insert "<td align=\"right\">" | |
1343 (timeclock-seconds-to-string (aref workday i)) | |
1344 "</td>\n") | |
1345 (setq i (1+ i)))) | |
1346 (insert "</tr>\n")) | |
1347 (insert "<tfoot> | |
1348 <td colspan=\"6\" align=\"center\"> | |
1349 <i>These are approximate figures</i></td> | |
1350 </tfoot> | |
1351 </table> | |
1352 </td></table>"))))) | |
1353 | |
1354 ;;; A helpful little function | |
1355 | |
1356 (defun timeclock-visit-timelog () | |
51861
91e4e5fd11de
(timeclock-use-display-time, timeclock-day-over-hook)
Glenn Morris <rgm@gnu.org>
parents:
51549
diff
changeset
|
1357 "Open the file named by `timeclock-file' in another window." |
36851 | 1358 (interactive) |
1359 (find-file-other-window timeclock-file)) | |
30781 | 1360 |
1361 (provide 'timeclock) | |
1362 | |
1363 (run-hooks 'timeclock-load-hook) | |
1364 | |
1365 ;; make sure we know the list of reasons, projects, and have computed | |
1366 ;; the last event and current discrepancy. | |
1367 (if (file-readable-p timeclock-file) | |
1368 (timeclock-reread-log)) | |
1369 | |
52401 | 1370 ;;; arch-tag: a0be3377-deb6-44ec-b9a2-a7be28436a40 |
30781 | 1371 ;;; timeclock.el ends here |