annotate lisp/calendar/timeclock.el @ 46160:b88409633904

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