From: Michael Andreen <harv@ruin.nu>
Date: Sat, 13 Sep 2008 09:46:08 +0000 (+0200)
Subject: Support fractional def points.
X-Git-Url: https://ruin.nu/git/?p=ndwebbie.git;a=commitdiff_plain;h=b81e2504bcffa9e695fa8431705dc175c946dd13

Support fractional def points.

Also, use numeric type for other points for compatibility.
---

diff --git a/database/fractional_points.sql b/database/fractional_points.sql
new file mode 100644
index 0000000..6c9b489
--- /dev/null
+++ b/database/fractional_points.sql
@@ -0,0 +1,5 @@
+ALTER TABLE users ALTER COLUMN defense_points TYPE NUMERIC(4,1);
+ALTER TABLE users ALTER COLUMN attack_points TYPE NUMERIC(3,0);
+UPDATE users set humor_points = -100 where humor_points < -100;
+ALTER TABLE users ALTER COLUMN humor_points TYPE NUMERIC(3,0);
+ALTER TABLE users ALTER COLUMN scan_points TYPE NUMERIC(5,0);
diff --git a/lib/NDWeb/Controller/Members.pm b/lib/NDWeb/Controller/Members.pm
index bb31b69..4e57477 100644
--- a/lib/NDWeb/Controller/Members.pm
+++ b/lib/NDWeb/Controller/Members.pm
@@ -32,7 +32,7 @@ sub index : Path : Args(0) {
 	$c->stash(comma => \&comma_value);
 	$c->stash(u => $dbh->selectrow_hashref(q{SELECT planet,defense_points
 			,attack_points,scan_points,humor_points
-			, (attack_points+defense_points+scan_points/20) as total_points
+			, (attack_points+defense_points+scan_points/20)::NUMERIC(5,1) as total_points
 			, sms,rank,hostmask FROM users WHERE uid = ?
 			},undef,$c->user->id)
 	);
@@ -285,7 +285,7 @@ sub points : Local {
 
 	my $query = $dbh->prepare(qq{SELECT username,defense_points,attack_points
 		,scan_points,humor_points
-		,(attack_points+defense_points+scan_points/20) as total_points
+		,(attack_points+defense_points+scan_points/20)::NUMERIC(4,0) as total_points
 		, count(NULLIF(rc.launched,FALSE)) AS raid_points
 		FROM users u LEFT OUTER JOIN raid_claims rc USING (uid)
 		WHERE uid IN (SELECT uid FROM groupmembers WHERE gid = 2)
diff --git a/root/src/members/points.tt2 b/root/src/members/points.tt2
index 01c9ff5..a90a8e3 100644
--- a/root/src/members/points.tt2
+++ b/root/src/members/points.tt2
@@ -10,8 +10,8 @@
 	<th><a href="[% c.uri_for('points','humor_points') %]">Humor</a></th>
 	</tr>
 [% FOR m IN members %]
-	<tr class="[% loop.count % 2 == 0 ? 'even' : 'odd' %]">
-	<td>[% m.username %]</td>
+	<tr align="right" class="[% loop.count % 2 == 0 ? 'even' : 'odd' %]">
+	<td align="left">[% m.username %]</td>
 	<td>[% m.total_points %]</td>
 	<td>[% m.defense_points %]</td>
 	<td>[% m.attack_points %]</td>