Compare commits

...

3 commits

3 changed files with 34 additions and 31 deletions

View file

@ -288,23 +288,24 @@
(define* (check-mailing-list mls name #:pred? (pred? #f)) (define* (check-mailing-list mls name #:pred? (pred? #f))
(define ml (find-mailman-list mls name)) (define ml (find-mailman-list mls name))
(let-values (((missing surplus) (when ml
(mailman-compare-members ml (let-values (((missing surplus)
(mbase-active-emails MB (mailman-compare-members ml
#:suspended #t (mbase-active-emails MB
#:pred? pred? #:suspended #t
)))) #:pred? pred?
(if (null? (cdr ml)) ))))
(print "Skipping ML check - not loaded") (if (null? (cdr ml))
(if (and (null? missing) (print "Skipping ML check - not loaded")
(null? surplus)) (if (and (null? missing)
(print (format "~a mailing list membership in sync." (string-capitalize name))) (null? surplus))
(let () (print (format "~a mailing list membership in sync." (string-capitalize name)))
(print (format "~a mailing list:" (string-capitalize name))) (let ()
(when (not (null? missing)) (print (format "~a mailing list:" (string-capitalize name)))
(print " Missing: " missing)) (when (not (null? missing))
(when (not (null? surplus)) (print " Missing: " missing))
(print " Outsiders: " surplus))))))) (when (not (null? surplus))
(print " Outsiders: " surplus))))))))
(define (rada-ml-pred? mr) (define (rada-ml-pred? mr)
(or (brmember-council? mr) (or (brmember-council? mr)

View file

@ -122,19 +122,21 @@
;; Converts the entry into the fee ;; Converts the entry into the fee
(define (member-calendar-entry->fee e) (define (member-calendar-entry->fee e)
(if e (with-current-month
(if (member 'existing (cadr e)) (car e)
(if (member 'suspended (cadr e)) (if e
0 ; Suspended (if (member 'existing (cadr e))
(if (member 'destroyed (cadr e)) (if (member 'suspended (cadr e))
0 ; Destroyed 0 ; Suspended
(if (member 'student (cadr e)) (if (member 'destroyed (cadr e))
(lookup-member-fee 'student) ; Student 0 ; Destroyed
(if (caddr e) (if (member 'student (cadr e))
(caddr e) (lookup-member-fee 'student) ; Student
(lookup-member-fee 'regular))))) ; Normal (if (caddr e)
0) ; Nonexistent - should not happen (caddr e)
0)) ; Nonexistent (lookup-member-fee 'regular))))) ; Normal
0) ; Nonexistent - should not happen
0))) ; Nonexistent
;; Converts the calendar into a table where rows represent years and ;; Converts the calendar into a table where rows represent years and
;; contain the year in the first cell and 12 cells for months after ;; contain the year in the first cell and 12 cells for months after

View file

@ -39,7 +39,7 @@
(chicken format)) (chicken format))
;; Short banner ;; Short banner
(define banner-line "HackerBase 1.15 (c) 2023 Brmlab, z.s.") (define banner-line "HackerBase 1.15.1 (c) 2023 Brmlab, z.s.")
;; Banner source with numbers for ANSI CSI SGR ;; Banner source with numbers for ANSI CSI SGR
(define banner-source " (define banner-source "