Move all fees functions to member-fees module.
This commit is contained in:
parent
b37a7ac2fb
commit
d483025321
2 changed files with 21 additions and 18 deletions
23
bbstool.scm
23
bbstool.scm
|
@ -26,7 +26,6 @@ CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
||||||
")
|
")
|
||||||
|
|
||||||
(import testing
|
(import testing
|
||||||
(chicken format)
|
|
||||||
listing
|
listing
|
||||||
dictionary
|
dictionary
|
||||||
month
|
month
|
||||||
|
@ -135,23 +134,11 @@ CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
||||||
(print "Current month: " (month->string (*current-month*)))
|
(print "Current month: " (month->string (*current-month*)))
|
||||||
(newline)
|
(newline)
|
||||||
(if mr
|
(if mr
|
||||||
(let* ((mc (member-calendar mr))
|
(let ()
|
||||||
(fees (member-calendar->fees mc)))
|
|
||||||
(print-member-table mr)
|
(print-member-table mr)
|
||||||
(print (table->string (cons (map (lambda (c)
|
(print-member-calendar-table mr)
|
||||||
(sprintf "\t~A\t" c))
|
(print "Total fees: " (member-fees-total mr)))
|
||||||
(list "" 1 2 3 4 5 6 7 8 9 10 11 12))
|
(print-members-base-table MB))
|
||||||
(member-calendar->years-table mc))
|
|
||||||
#:table-border #t
|
|
||||||
#:row-border #t
|
|
||||||
#:col-border #t
|
|
||||||
#:ansi #t
|
|
||||||
))
|
|
||||||
;; (print fees)
|
|
||||||
(print "Total fees: " (foldl + 0 fees))
|
|
||||||
)
|
|
||||||
(print-members-base-table MB)
|
|
||||||
)
|
|
||||||
(newline))
|
(newline))
|
||||||
((print-stats)
|
((print-stats)
|
||||||
(newline)
|
(newline)
|
||||||
|
@ -185,6 +172,6 @@ CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
||||||
(loop (cdr mb)))))
|
(loop (cdr mb)))))
|
||||||
((fees)
|
((fees)
|
||||||
(newline)
|
(newline)
|
||||||
(print-member-fees-table MB))
|
(print-members-fees-table MB))
|
||||||
|
|
||||||
)
|
)
|
||||||
|
|
|
@ -37,6 +37,7 @@
|
||||||
member-fees-total
|
member-fees-total
|
||||||
member-credit-total
|
member-credit-total
|
||||||
print-members-fees-table
|
print-members-fees-table
|
||||||
|
print-member-calendar-table
|
||||||
)
|
)
|
||||||
|
|
||||||
(import scheme
|
(import scheme
|
||||||
|
@ -164,5 +165,20 @@
|
||||||
))
|
))
|
||||||
(sort (filter-members-by-predicate MB member-active?) member<?)))
|
(sort (filter-members-by-predicate MB member-active?) member<?)))
|
||||||
#:col-border #t #:row0-border #t)))
|
#:col-border #t #:row0-border #t)))
|
||||||
|
|
||||||
|
;; Nicely print calendar for given member
|
||||||
|
(define (print-member-calendar-table mr)
|
||||||
|
(let* ((mc (member-calendar mr))
|
||||||
|
(fees (member-calendar->fees mc)))
|
||||||
|
(print (table->string (cons (map (lambda (c)
|
||||||
|
(sprintf "\t~A\t" c))
|
||||||
|
(list "" 1 2 3 4 5 6 7 8 9 10 11 12))
|
||||||
|
(member-calendar->years-table mc))
|
||||||
|
#:table-border #t
|
||||||
|
#:row-border #t
|
||||||
|
#:col-border #t
|
||||||
|
#:ansi #t
|
||||||
|
))
|
||||||
|
))
|
||||||
|
|
||||||
)
|
)
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue