Work on member dashboard.

This commit is contained in:
Dominik Pantůček 2023-03-30 16:31:46 +02:00
parent 04fba0c776
commit 1147d73b11
2 changed files with 27 additions and 19 deletions

View file

@ -145,7 +145,6 @@ CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
(print-member-table mr) (print-member-table mr)
(print-member-calendar-table mr) (print-member-calendar-table mr)
(print "Total fees: " (member-fees-total mr)) (print "Total fees: " (member-fees-total mr))
(print-member-payments mr)
) )
(print-members-base-table MB)) (print-members-base-table MB))
(newline)) (newline))

View file

@ -32,7 +32,6 @@
print-member-info print-member-info
print-member-table print-member-table
print-member-source print-member-source
print-member-payments
print-members-base-info print-members-base-info
print-members-base-table print-members-base-table
print-members-base-stats print-members-base-stats
@ -81,8 +80,8 @@
(v (cdr kv))) (v (cdr kv)))
(loop (cdr sinfo))))))) (loop (cdr sinfo)))))))
;; Prints nicely formatted table ;; Returns nicely formatted table
(define (print-member-table mr) (define (member-info->table mr)
(let* ((aliases (dict-ref mr 'symlinks)) (let* ((aliases (dict-ref mr 'symlinks))
(mid (member-id mr)) (mid (member-id mr))
(head (list (if (is-4digit-prime? mid) (head (list (if (is-4digit-prime? mid)
@ -134,7 +133,18 @@
(ansi-string #:red #:bold "---"))))))) (ansi-string #:red #:bold "---")))))))
sikeys)) sikeys))
(result (filter identity (append head body)))) (result (filter identity (append head body))))
(print (table->string result #:table-border #t #:row-border #t #:col-border #t #:ansi #t)))) (table->string result #:table-border #f #:row-border #t #:col-border #t #:ansi #t)))
;; Prints nicely formatted table
(define (print-member-table mr)
(print
(table->string
(list (list "Basic Information" "Payments")
(list (member-info->table mr)
(member-payments->table mr))
)
#:row0-border #t
#:col-border #t)))
;; Nicely prints the member source with any errors recorded. ;; Nicely prints the member source with any errors recorded.
(define (print-member-source mr) (define (print-member-source mr)
@ -149,20 +159,19 @@
))) )))
;; Prints nicely printed payments ;; Prints nicely printed payments
(define (print-member-payments mr) (define (member-payments->table mr)
(print (table->string (cons
(table->string (cons (list "Var" "Amount" "Cur" "Date" "TrId")
(list "Var" "Amount" "Cur" "Date" "TrId") (map (lambda (tr)
(map (lambda (tr) (list (sprintf "\t~A" (bank-transaction-varsym tr))
(list (sprintf "\t~A" (bank-transaction-varsym tr)) (sprintf "\t~A" (bank-transaction-amount tr))
(sprintf "\t~A" (bank-transaction-amount tr)) (bank-transaction-currency tr)
(bank-transaction-currency tr) (bank-transaction-date tr)
(bank-transaction-date tr) (bank-transaction-id tr)))
(bank-transaction-id tr))) (member-payments mr)))
(member-payments mr))) #:row0-border #t
#:row0-border #t #:col-border #t
#:col-border #t ))
)))
;; 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 ", ".