From 34f54b2bb0b66704308603143e69d56220f125f7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Pant=C5=AF=C4=8Dek?=
 <dominik.pantucek@trustica.cz>
Date: Sun, 18 Jun 2023 19:45:19 +0200
Subject: [PATCH] Preliminary payments and fees in one table.

---
 src/hackerbase.scm       |  9 ++++-----
 src/members-payments.scm |  2 +-
 src/members-print.scm    | 17 +++++++++++++++++
 3 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/src/hackerbase.scm b/src/hackerbase.scm
index 2272023..28453d4 100644
--- a/src/hackerbase.scm
+++ b/src/hackerbase.scm
@@ -269,10 +269,7 @@
    (print "Current month: " (cal-month->string (*current-month*)))
    (newline)
    (if mr
-       (let ()
-	 (print-member-table mr)
-	 (brmember-balance-history mr)
-	 )
+       (print-member-table mr)
        (print-members-base-table MB))
    (newline))
   ((print-stats)
@@ -320,7 +317,9 @@
 		(loop (cdr mrs))))))))
   ((fees)
    (newline)
-   (print-members-fees-table MB (-show-destroyed-)))
+   (if mr
+       (print-member-balances-table mr)
+       (print-members-fees-table MB (-show-destroyed-))))
   ((repl)
    (repl))
   ((genweb)
diff --git a/src/members-payments.scm b/src/members-payments.scm
index 076651b..10c476b 100644
--- a/src/members-payments.scm
+++ b/src/members-payments.scm
@@ -282,7 +282,7 @@
 		(bal 0))
        (if (null? trs)
 	   (let ((res (reverse rbls)))
-	     (print res)
+	     ;;(print res)
 	     res)
 	   (let* ((amt (list-ref (car trs) 4))
 		  (nbal (+ bal amt)))
diff --git a/src/members-print.scm b/src/members-print.scm
index c85dba8..5279f63 100644
--- a/src/members-print.scm
+++ b/src/members-print.scm
@@ -39,6 +39,7 @@
   print-members-fees-table
   unpaired-table
   print-unpaired-table
+  print-member-balances-table
   )
 
  (import scheme
@@ -543,4 +544,20 @@
      (unpaired-table mb)
      "\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))))
+
  )