From: Mischa POSLAWSKY <perl@shiar.org>
Date: Sat, 21 Apr 2018 18:22:41 +0000 (+0200)
Subject: sc: option to order alphabetically by name
X-Git-Tag: v1.12~76
X-Git-Url: http://git.shiar.net/sheet.git/commitdiff_plain/6043b2010d9fd45b56e89e388634e913d0d45b10

sc: option to order alphabetically by name

Describe first column as appropriate for default grouped ordering.
---

diff --git a/sc.plp b/sc.plp
index 3a7f36b..88ff4b1 100644
--- a/sc.plp
+++ b/sc.plp
@@ -91,8 +91,8 @@ sub coltoggle {
 }
 :><table class="units">
 <thead><tr>
-	<th></th>
-	<th><:= coltoggle('name', '') :></th>
+	<th><:= coltoggle(exists $get{order} ? 'race' : 'source' => '') :></th>
+	<th><:= coltoggle(name => 'name') :></th>
 	<th class="val min" title=minerals>cost</th>
 	<th class="val gas">gas</th>
 	<th class="val time"><:= coltoggle(qw'build cost') :></th>
@@ -343,17 +343,20 @@ sub showrangeint {
 	if (exists $get{order}) {
 		$grouped = 0;
 		$get{order} ||= '';
-		if ($get{order} eq 'size') {
-			$_->{order} = (
-				$_->{pop}*16 + ($_->{size} // $_->{suit}) + $_->{cargo}/8
-				+ $_->{hp}/512 + $_->{min}/8192
-			) for @rows;
+		if ($get{order} eq 'name') {
+			@rows = sort {$a->{name} cmp $b->{name}} @rows;
 		}
 		elsif ($get{order} eq 'cost') {
 			$_->{order} = (
 				$_->{gas}*1.5 + $_->{min} + $_->{pop}/8 + $_->{build}/256/8
 			) for @rows;
 		}
+		elsif ($get{order} eq 'size') {
+			$_->{order} = (
+				$_->{pop}*16 + ($_->{size} // $_->{suit}) + $_->{cargo}/8
+				+ $_->{hp}/512 + $_->{min}/8192
+			) for @rows;
+		}
 		elsif ($get{order} eq 'attack') {
 			$_->{order} = $_->{hp} / 1024 + $_->{shield} / 1008 + max(
 				map {