From 85640563201b15af51e9e115aa19ef83205a98c8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Pant=C5=AF=C4=8Dek?=
 <dominik.pantucek@trustica.cz>
Date: Mon, 20 Mar 2023 12:44:41 +0100
Subject: [PATCH] Member sorting.

---
 member-record.scm |  6 ++++++
 members-base.scm  | 12 ++++++------
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/member-record.scm b/member-record.scm
index f9d9b6d..9403943 100644
--- a/member-record.scm
+++ b/member-record.scm
@@ -41,6 +41,7 @@
   member-suspended-months
   member-source
   print-member-source
+  member<?
   member-record-tests!
   )
 
@@ -194,6 +195,11 @@
       "..." ; Not used
       )))
 
+ ;; Comparator of member records based on nickname.
+ (define (member<? a b)
+   (string-ci<? (member-nick a)
+		(member-nick b)))
+
  ;; Performs module self-tests.
  (define (member-record-tests!)
    (run-tests
diff --git a/members-base.scm b/members-base.scm
index 2e0379c..b84e8d0 100644
--- a/members-base.scm
+++ b/members-base.scm
@@ -308,23 +308,23 @@
 	   (destroyed-mrs (dict-ref bi 'destroyed))
 	   (student-mrs (dict-ref bi 'students)))
       (print a:success "  Active (" (length active-mrs) "): " a:default
-	     (member-records->string active-mrs))
+	     (member-records->string (sort active-mrs member<?)))
       (print a:warning "  Suspended (" (length suspended-mrs) "): " a:default
-	     (member-records->string suspended-mrs))
+	     (member-records->string (sort suspended-mrs member<?)))
       (print a:warning "  Destroyed (" (length destroyed-mrs) "): " a:default
-	     (member-records->string destroyed-mrs))
+	     (member-records->string (sort destroyed-mrs member<?)))
       (print a:highlight "  Students (" (length student-mrs) "): " a:default
-	     (member-records->string student-mrs))
+	     (member-records->string (sort student-mrs member<?)))
       (let ((suspended2 (filter-members-by-predicate
 			 suspended-mrs
 			 (lambda (mr)
 			   (>= (member-suspended-months mr) 24)))))
 	(when (not (null? suspended2))
 	  (print "  Suspended for at least 24 months: "
-		 (member-records->string suspended2 "~N (~S)"))))
+		 (member-records->string (sort suspended2 member<?) "~N (~S)"))))
       (when (not (null? invalid-mrs))
 	(print a:error "  Invalid Id (" (length invalid-mrs) "): "
-	       (member-records->string invalid-mrs "~N (~I)")
+	       (member-records->string (sort invalid-mrs member<?) "~N (~I)")
 	       a:default)))))
 
  ;; Prints the stats in format used by gnuplot.