Preliminary payments and fees in one table.
This commit is contained in:
parent
a6f307d230
commit
34f54b2bb0
3 changed files with 22 additions and 6 deletions
|
@ -269,10 +269,7 @@
|
||||||
(print "Current month: " (cal-month->string (*current-month*)))
|
(print "Current month: " (cal-month->string (*current-month*)))
|
||||||
(newline)
|
(newline)
|
||||||
(if mr
|
(if mr
|
||||||
(let ()
|
|
||||||
(print-member-table mr)
|
(print-member-table mr)
|
||||||
(brmember-balance-history mr)
|
|
||||||
)
|
|
||||||
(print-members-base-table MB))
|
(print-members-base-table MB))
|
||||||
(newline))
|
(newline))
|
||||||
((print-stats)
|
((print-stats)
|
||||||
|
@ -320,7 +317,9 @@
|
||||||
(loop (cdr mrs))))))))
|
(loop (cdr mrs))))))))
|
||||||
((fees)
|
((fees)
|
||||||
(newline)
|
(newline)
|
||||||
(print-members-fees-table MB (-show-destroyed-)))
|
(if mr
|
||||||
|
(print-member-balances-table mr)
|
||||||
|
(print-members-fees-table MB (-show-destroyed-))))
|
||||||
((repl)
|
((repl)
|
||||||
(repl))
|
(repl))
|
||||||
((genweb)
|
((genweb)
|
||||||
|
|
|
@ -282,7 +282,7 @@
|
||||||
(bal 0))
|
(bal 0))
|
||||||
(if (null? trs)
|
(if (null? trs)
|
||||||
(let ((res (reverse rbls)))
|
(let ((res (reverse rbls)))
|
||||||
(print res)
|
;;(print res)
|
||||||
res)
|
res)
|
||||||
(let* ((amt (list-ref (car trs) 4))
|
(let* ((amt (list-ref (car trs) 4))
|
||||||
(nbal (+ bal amt)))
|
(nbal (+ bal amt)))
|
||||||
|
|
|
@ -39,6 +39,7 @@
|
||||||
print-members-fees-table
|
print-members-fees-table
|
||||||
unpaired-table
|
unpaired-table
|
||||||
print-unpaired-table
|
print-unpaired-table
|
||||||
|
print-member-balances-table
|
||||||
)
|
)
|
||||||
|
|
||||||
(import scheme
|
(import scheme
|
||||||
|
@ -543,4 +544,20 @@
|
||||||
(unpaired-table mb)
|
(unpaired-table mb)
|
||||||
"\n")))
|
"\n")))
|
||||||
|
|
||||||
|
;; Prints fees/payments/balances of one member
|
||||||
|
(define (print-member-balances-table mr)
|
||||||
|
(let ((data (map (lambda (r)
|
||||||
|
(list (cal-day->string (cadr r))
|
||||||
|
(list-ref r 4)
|
||||||
|
(format "\t~A" (exact->inexact (list-ref r 5)))
|
||||||
|
(format "\t~A" (exact->inexact (car r)))
|
||||||
|
))
|
||||||
|
(brmember-balance-history mr))))
|
||||||
|
(print-table
|
||||||
|
#:border '(((#:bottom #:right light) ... (#:bottom light))
|
||||||
|
((#:right light) ... none)
|
||||||
|
...)
|
||||||
|
(cons '("\tDate\t" "\tComment\t" "\tAmount\t" "\tBalance\t")
|
||||||
|
data))))
|
||||||
|
|
||||||
)
|
)
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue