brmlab/hackerbase
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Port members-print to new table interface.

Browse source
This commit is contained in:
Dominik Pantůček 2023-06-15 22:07:19 +02:00
parent 628a37d06c
commit bdc5396b1a
1 changed files with 16 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

27
src/members-print.scm
View file

@ -98,7 +98,7 @@
(lambda (c) (lambda (c)
(list (car c) (cdr c))) (list (car c) (cdr c)))
v) v)
#:col-border #t))) #:border '(((#:right light) ... none) ...))))
((credit) ((credit)
(list k (list k
(table->string (table->string
@ -107,7 +107,7 @@
(cal-format (cadr c)) (cal-format (cadr c))
(caddr c))) (caddr c)))
(brmember-credit mr)) (brmember-credit mr))
#:col-border #t))) #:border '(((#:right light) ... none) ...))))
((suspend student member council chair revision grant) ((suspend student member council chair revision grant)
(list k (list k
(table->string (table->string
@ -117,12 +117,12 @@
(list (list
(string-append (cal-day/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-day/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))
#:col-border #t))) #:border '(((#:right light) ... none) ...))))
(else (else
(if v (if v
(list k v) (list k v)
@ -132,7 +132,11 @@
(mailman (list (list "Mailing Lists" (mailman (list (list "Mailing Lists"
(string-intersperse (brmember-mailman mr) "\n")))) (string-intersperse (brmember-mailman mr) "\n"))))
(result (filter identity (append head body mailman)))) (result (filter identity (append head body mailman))))
(table->string result #:table-border #f #:row-border #t #:col-border #t #:ansi #t))) (table->string result
#:border '(((#:bottom #:right light) ... (#:bottom light))
((#:right light) ... none)
...)
#:ansi-reset? #t)))
;; Prints nicely formatted table ;; Prints nicely formatted table
(define (print-member-table mr) (define (print-member-table mr)
@ -143,8 +147,9 @@
(member-payments->table mr) (member-payments->table mr)
(member-calendar->table mr)) (member-calendar->table mr))
) )
#:row0-border #t #:border '(((#:bottom #:right light) ... (#:bottom light))
#:col-border #t)) ((#:right light) ... none)
...)))
(let* ((balance (member-balance mr)) (let* ((balance (member-balance mr))
(fees (ldict-ref balance 'fees)) (fees (ldict-ref balance 'fees))
(credit (ldict-ref balance 'credit)) (credit (ldict-ref balance 'credit))
@ -195,9 +200,9 @@
(bank-transaction-date tr) (bank-transaction-date tr)
(bank-transaction-id tr))) (bank-transaction-id tr)))
(brmember-payments mr))) (brmember-payments mr)))
#:row0-border #t #:border '(((#:bottom #:right light) ... (#:bottom light))
#:col-border #t ((#:right light) ... none)
)) ...)))
;; Converts member records to string, optional arguments are format ;; Converts member records to string, optional arguments are format
;; and separator. Format defaults to "~N" and separator to ", ". ;; and separator. Format defaults to "~N" and separator to ", ".