Support cal-day in joined/destroyed.
This commit is contained in:
parent
9a55a56c6a
commit
82a4742914
3 changed files with 7 additions and 5 deletions
|
@ -96,7 +96,7 @@
|
||||||
(kind (cadr mk)))
|
(kind (cadr mk)))
|
||||||
(foldl (lambda (mr value)
|
(foldl (lambda (mr value)
|
||||||
(let* ((mspec (string-first+rest (car value)))
|
(let* ((mspec (string-first+rest (car value)))
|
||||||
(month (string->cal-month (car mspec)))
|
(month (parse-cal-day/month (car mspec)))
|
||||||
(comment (cdr mspec)))
|
(comment (cdr mspec)))
|
||||||
(if month
|
(if month
|
||||||
(brmember-sub-prepend
|
(brmember-sub-prepend
|
||||||
|
|
|
@ -74,7 +74,8 @@
|
||||||
(let ((last-month (if (null? args)
|
(let ((last-month (if (null? args)
|
||||||
(*current-month*)
|
(*current-month*)
|
||||||
(car args)))
|
(car args)))
|
||||||
(first-month (cal-period-since (car (brmember-info mr 'member)))))
|
(first-month (cal-ensure-month
|
||||||
|
(cal-period-since (car (brmember-info mr 'member))))))
|
||||||
(let loop ((cm first-month)
|
(let loop ((cm first-month)
|
||||||
(cal '()))
|
(cal '()))
|
||||||
(if (cal-month>? cm last-month)
|
(if (cal-month>? cm last-month)
|
||||||
|
|
|
@ -63,7 +63,8 @@
|
||||||
brmember-format
|
brmember-format
|
||||||
specification
|
specification
|
||||||
cal-format
|
cal-format
|
||||||
util-git)
|
util-git
|
||||||
|
cal-day)
|
||||||
|
|
||||||
;; Returns nicely formatted table
|
;; Returns nicely formatted table
|
||||||
(define (member-info->table mr)
|
(define (member-info->table mr)
|
||||||
|
@ -114,10 +115,10 @@
|
||||||
(map
|
(map
|
||||||
(lambda (p)
|
(lambda (p)
|
||||||
(list
|
(list
|
||||||
(string-append (cal-month->string
|
(string-append (cal-day/month->string
|
||||||
(cal-period-since p)) " "
|
(cal-period-since p)) " "
|
||||||
(or (cal-period-scomment p) ""))
|
(or (cal-period-scomment p) ""))
|
||||||
(string-append (cal-month->string
|
(string-append (cal-day/month->string
|
||||||
(cal-period-before p)) " "
|
(cal-period-before p)) " "
|
||||||
(or (cal-period-bcomment p) ""))))
|
(or (cal-period-bcomment p) ""))))
|
||||||
v))
|
v))
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue