Use table for member information, fix a few design mistakes in period/month display.
This commit is contained in:
parent
eb80b4e709
commit
e440d1df56
5 changed files with 84 additions and 33 deletions
|
@ -30,6 +30,7 @@
|
|||
member-record
|
||||
(
|
||||
print-member-record-info
|
||||
print-member-record-table
|
||||
member-destroyed?
|
||||
member-suspended?
|
||||
member-active?
|
||||
|
@ -57,7 +58,9 @@
|
|||
member-file
|
||||
listing
|
||||
ansi
|
||||
configuration)
|
||||
configuration
|
||||
table
|
||||
utils)
|
||||
|
||||
;; Prints human-readable information
|
||||
(define (print-member-record-info mr)
|
||||
|
@ -88,6 +91,56 @@
|
|||
v)))
|
||||
(loop (cdr sinfo)))))))
|
||||
|
||||
;; Prints nicely formatted table
|
||||
(define (print-member-record-table mr)
|
||||
(let* ((aliases (mr-ref mr 'symlinks))
|
||||
(head (list (list "ID:" (mr-ref mr 'id))
|
||||
(list (sprintf "Alias~A:" (if (> (length aliases) 1) "es" ""))
|
||||
(string-intersperse (map symbol->string aliases) ", "))
|
||||
(if (member-suspended? mr)
|
||||
(list "Suspended for:"
|
||||
(let ((msm (member-suspended-months mr)))
|
||||
(sprintf "~A month~A" msm
|
||||
(if (> msm 1) "s" ""))))
|
||||
#f)))
|
||||
(info (dict-ref mr 'info))
|
||||
(sikeys (sort (dict-keys info)
|
||||
(lambda (a b)
|
||||
(string<?
|
||||
(symbol->string a)
|
||||
(symbol->string b)))))
|
||||
(body (map (lambda (k)
|
||||
(if (eq? k member-file-error-symbol)
|
||||
#f
|
||||
(let ((v (dict-ref info k)))
|
||||
(case k
|
||||
((joined)
|
||||
(list k (month->string v)))
|
||||
((card desfire credit)
|
||||
(list k
|
||||
(table->string
|
||||
(map
|
||||
(lambda (c)
|
||||
(list (car c) (cdr c)))
|
||||
v)
|
||||
#:col-border #t)))
|
||||
((suspend student)
|
||||
(list k
|
||||
(table->string
|
||||
(cons (list "Since" "Until")
|
||||
(map
|
||||
(lambda (p)
|
||||
(list
|
||||
(month->string (car p))
|
||||
(month->string (cdr p))))
|
||||
v))
|
||||
#:col-border #t)))
|
||||
(else
|
||||
(list k v))))))
|
||||
sikeys))
|
||||
(result (filter identity (append head body))))
|
||||
(print (table->string result #:table-border #t #:row-border #t #:col-border #t))))
|
||||
|
||||
;; Returns key from the top-level (members-base) record if it exists,
|
||||
;; queries the 'info key otherwise. Optional default argument works
|
||||
;; like with dict-ref.
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue