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

chronometrist - use text buttons (links)

Browse Source
This commit is contained in:
Kashish Sharma 2018-09-23 20:06:47 +05:30
parent 94b7c1748b
commit df11e73922
2 changed files with 35 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
chronometrist.el
View File

@ -115,13 +115,16 @@ SECONDS]. SECONDS must be a positive integer."
(timeclock-reread-log)
(->> timeclock-project-list
(-sort #'string-lessp)
(--map-indexed (list it
(vector (number-to-string (1+ it-index))
it
(-> (chronometrist-project-time-one-day it)
(chronometrist-format-time))
(if (chronometrist-project-active? it)
"*" ""))))))
(--map-indexed
(list it
(vector (number-to-string (1+ it-index))
(list it
'action 'chronometrist-toggle-project-button
'follow-link t)
(-> (chronometrist-project-time-one-day it)
(chronometrist-format-time))
(if (chronometrist-project-active? it)
"*" ""))))))
(defun chronometrist-project-at-point ()
"Return the project at point in the `chronometrist' buffer, or
@ -195,10 +198,10 @@ there is no corresponding project."
(timeclock-reread-log)
(make-local-variable 'tabulated-list-format)
(setq tabulated-list-format [("#" 3 t)
(setq tabulated-list-format [("#" 3 t)
("Project" 25 t)
("Time" 10 t)
("Active" 3 t)])
("Time" 10 t)
("Active" 3 t)])
(make-local-variable 'tabulated-list-entries)
(setq tabulated-list-entries 'chronometrist-entries)
@ -215,6 +218,26 @@ there is no corresponding project."
;; ## COMMANDS ##
;; Duplication between this function and `chronometrist-toggle-project's logic
(defun chronometrist-toggle-project-button (button)
(let ((current-project (chronometrist-current-project))
(project-at-point (chronometrist-project-at-point)))
;; If we're clocked in to anything - clock out or change projects
;; Otherwise, just clock in
(if current-project
(if (equal project-at-point current-project)
(timeclock-out nil nil t)
;; We don't use timeclock-change because it doesn't prompt for the reason
(progn
(timeclock-out nil nil t)
(timeclock-in nil project-at-point nil)))
(timeclock-in nil project-at-point nil))
;; Trying to update partially doesn't update the activity indicator. Why?
(tabulated-list-print t nil)
(chronometrist-print-non-tabular)
(chronometrist-goto-last-project)
(chronometrist-maybe-start-timer)))
(defun chronometrist-toggle-project (&optional arg)
"In a `chronometrist' buffer, start or stop the project at
point. If there is no project at point, do nothing.

2
hacking.md
View File

@ -9,6 +9,8 @@ I recommend using
* [nameless-mode](https://github.com/Malabarba/Nameless) for easier reading of Emacs Lisp code, and
* [visual-fill-column-mode](https://github.com/joostkremers/visual-fill-column) for easier reading of the Markdown files (without actually "filling" i.e. inserting newlines, so the same file is equally readable on any viewer/editor which supports line-wrapping).
Both [chronometrist.el](chronometrist.el) and [chronometrist-report.el](chronometrist-report.el) use timers to keep themselves updated. Sometimes, when hacking, the timers may cause subtle bugs which are very hard to debug. Restarting Emacs can fix them, so try that as a first sanity check.
# chronometrist-report date range logic
A quick description -
1. We get the current date in calendrical form using `(decode-time)`.