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

Use specific fee in all computations.

Browse source
This commit is contained in:
Dominik Pantůček 2023-12-23 19:57:40 +01:00
parent 28dd25998b
commit c987ac6c81
2 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/brmember.scm
View file

@ -487,8 +487,7 @@
(let ((fee-period (cal-month-find-period fee-periods))) (let ((fee-period (cal-month-find-period fee-periods)))
(if fee-period (if fee-period
(let () (let ()
(print fee-period) (car (cal-period-scomment fee-period)))
#t)
#f)) #f))
#f))) #f)))

9
src/members-fees.scm
View file

@ -86,7 +86,6 @@
(with-current-month (with-current-month
cm cm
(brmember-flags mr)) (brmember-flags mr))
;; TODO: the following needs to be handled everywhere
(with-current-month (with-current-month
cm cm
(brmember-spec-fee mr))) (brmember-spec-fee mr)))
@ -115,7 +114,9 @@
(ansi-string #:bgblack "\xc2\xa0\xc2\xa0") ; Destroyed (ansi-string #:bgblack "\xc2\xa0\xc2\xa0") ; Destroyed
(if (member 'student (cadr e)) (if (member 'student (cadr e))
(ansi-string #:bgyellow "\xc2\xa0\xc2\xa0") ; Student (ansi-string #:bgyellow "\xc2\xa0\xc2\xa0") ; Student
(ansi-string #:bggreen "\xc2\xa0\xc2\xa0")))) ; Normal (if (caddr e)
(ansi-string #:bgblue (format "~a" (caddr e)))
(ansi-string #:bggreen "\xc2\xa0\xc2\xa0"))))) ; Normal
"\xc2\xa0\xc2\xa0") ; Nonexistent - should not happen "\xc2\xa0\xc2\xa0") ; Nonexistent - should not happen
"\xc2\xa0\xc2\xa0")) ; Nonexistent "\xc2\xa0\xc2\xa0")) ; Nonexistent
@ -129,7 +130,9 @@
0 ; Destroyed 0 ; Destroyed
(if (member 'student (cadr e)) (if (member 'student (cadr e))
(lookup-member-fee 'student) ; Student (lookup-member-fee 'student) ; Student
(lookup-member-fee 'regular)))) ; Normal (if (caddr e)
(caddr e)
(lookup-member-fee 'regular))))) ; Normal
0) ; Nonexistent - should not happen 0) ; Nonexistent - should not happen
0)) ; Nonexistent 0)) ; Nonexistent