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

Fix basic info.

Browse source
This commit is contained in:
Dominik Pantůček 2023-03-29 18:35:26 +02:00
parent 0c7cf11297
commit 2117749d61
4 changed files with 8 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

5
member-fees.scm
View file

@ -49,7 +49,8 @@
month month
ansi ansi
table table
members-base) members-base
period)
;; Returns a list of months where each month is a list containing: ;; Returns a list of months where each month is a list containing:
;; * month (from month module) ;; * month (from month module)
@ -59,7 +60,7 @@
(let ((last-month (if (null? args) (let ((last-month (if (null? args)
(*current-month*) (*current-month*)
(car args)))) (car args))))
(let loop ((cm (member-record-info mr 'joined)) (let loop ((cm (period-since (member-record-info mr 'member)))
(cal '())) (cal '()))
(if (month>? cm last-month) (if (month>? cm last-month)
(reverse cal) (reverse cal)

9
member-parser.scm
View file

@ -103,13 +103,6 @@
(if ok? (if ok?
mr1 mr1
(member-record-add-highlight mr1 line-number msg 3 'error)))) (member-record-add-highlight mr1 line-number msg 3 'error))))
((joined)
(let* ((month (string->month (car value)))
(mr0 (member-record-sub-set mr output key month)))
(if month
mr0
(member-record-add-highlight
mr0 (cdr value) "Invalid month specification" 3 'error))))
((card desfire) ((card desfire)
(member-record-sub-set mr output key (member-record-sub-set mr output key
(map (map
@ -139,7 +132,7 @@
(apply (apply
member-record-sub-ensure member-record-sub-ensure
mr 'info mr 'info
'member (make-period (*member-default-joined*) #f) 'member (list (make-period (*member-default-joined*) #f))
(join (map (lambda (mk) (list mk #f)) mandatory-keys)))) (join (map (lambda (mk) (list mk #f)) mandatory-keys))))
;; Pass 0: Removes any comments and removes any leading and trailing ;; Pass 0: Removes any comments and removes any leading and trailing

4
member-print.scm
View file

@ -98,8 +98,6 @@
(body (map (lambda (k) (body (map (lambda (k)
(let ((v (dict-ref info k))) (let ((v (dict-ref info k)))
(case k (case k
((joined)
(list k (month->string v)))
((card desfire credit) ((card desfire credit)
(list k (list k
(table->string (table->string
@ -108,7 +106,7 @@
(list (car c) (cdr c))) (list (car c) (cdr c)))
v) v)
#:col-border #t))) #:col-border #t)))
((suspend student) ((suspend student member)
(list k (list k
(table->string (table->string
(cons (list "Since" "Until") (cons (list "Since" "Until")

7
member-record.scm
View file

@ -263,11 +263,10 @@
(and (not (member-destroyed? mr)) (and (not (member-destroyed? mr))
(not (member-suspended? mr)))) (not (member-suspended? mr))))
;; Returns true if the member has joined. ;; Returns true if the member is currently a member
(define (member-existing? mr) (define (member-existing? mr)
(let ((joined (member-record-info mr 'joined))) (month-in-periods?
(and joined (member-record-info mr 'member)))
(month<=? joined (*current-month*)))))
;; Returns a list of flags of given member record. ;; Returns a list of flags of given member record.
(define (member-flags mr) (define (member-flags mr)