From 8a5f85408da82b3274b96009a3428ef658f46eb6 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Bj=C3=B8rn=20Rustad?= <rustadbjornen@gmail.com>
Date: Sat, 17 Aug 2013 13:55:31 +0200
Subject: [PATCH] Show points all around

---
 duplo.sql                      | 16 ----------------
 lib/Duplo/Stage.pm             |  7 ++++++-
 templates/manager/team.html.ep | 14 +++++++-------
 templates/stage/stage.html.ep  |  9 +++++++--
 4 files changed, 20 insertions(+), 26 deletions(-)

diff --git a/duplo.sql b/duplo.sql
index 99828b0..4036964 100644
--- a/duplo.sql
+++ b/duplo.sql
@@ -186,22 +186,6 @@ CREATE TABLE rider_manager_team (
 
 GRANT SELECT, UPDATE, INSERT, DELETE ON rider_manager_team TO duplo;
 
-CREATE LANGUAGE plpgsql;
-
-CREATE OR REPLACE FUNCTION switches (int, int) RETURNS integer AS $$
-DECLARE
-	stage RECORD;
-	num INTEGER;
-BEGIN
-	num = 0;
-	FOR stage IN SELECT DISTINCT stage, "date" FROM rider_manager_team NATURAL JOIN stage WHERE team = $1 ORDER BY "date" LOOP
-		EXECUTE SELECT * FROM stage;
-	END LOOP;
-	
-	RETURN num;
-END;
-$$ LANGUAGE plpgsql;
-
 CREATE OR REPLACE FUNCTION stage_team (int, int) RETURNS TABLE (rider int, name varchar, stage int, team int, team_name varchar, price int, type rider_type, points integer)
 AS $$
 
diff --git a/lib/Duplo/Stage.pm b/lib/Duplo/Stage.pm
index 5993058..5c0ef36 100644
--- a/lib/Duplo/Stage.pm
+++ b/lib/Duplo/Stage.pm
@@ -52,7 +52,8 @@ sub stage {
 		  r.name AS rider_name,
 		  l.line,
 		  rl.\"number\",
-		  rl.time
+		  rl.time,
+		  rs.points
 		FROM
 		  rider_line AS rl
 		JOIN
@@ -64,10 +65,14 @@ sub stage {
 		JOIN
 		  stage AS s
 		ON (l.stage = s.stage)
+		LEFT OUTER JOIN
+		  rider_stage AS rs
+		ON (r.rider = rs.rider AND s.stage = rs.stage)
 		WHERE
 		  l.\"type\" = 'FINISH'
 		AND
 		  l.stage = ?
+		ORDER BY \"number\"
 		", { Slice => {} }, $stage);
 
 	my $lines_ref = $dbh->selectall_arrayref("
diff --git a/templates/manager/team.html.ep b/templates/manager/team.html.ep
index 1d3aae0..d2f112f 100644
--- a/templates/manager/team.html.ep
+++ b/templates/manager/team.html.ep
@@ -9,13 +9,13 @@
 % for my $stage (@{ $stages }) {
 <h3><%= $stage->{'name'} %></h3>
 <table class="table table-condensed">
-  <th>
-    <td>Type</td>
-    <td>Name</td>
-    <td>Team</td>
-    <td>Price</td>
-    <td>Points</td>
-  </th>
+  <tr>
+    <th>Type</th>
+    <th>Name</th>
+    <th>Team</th>
+    <th>Price</th>
+    <th>Points</th>
+  </tr>
   % for my $rider (@{ $stage_team->{$stage->{'stage'}} }) {
   <tr>
     <td><%= $rider->{'type'} %></td>
diff --git a/templates/stage/stage.html.ep b/templates/stage/stage.html.ep
index 11b81e3..6f3089c 100644
--- a/templates/stage/stage.html.ep
+++ b/templates/stage/stage.html.ep
@@ -22,11 +22,18 @@
 
 <h3>Stage results</h3>
 <table class="table table-condensed">
+  <tr>
+    <th>#</th>
+    <th>Name</th>
+    <th>Time</th>
+    <th>Points</th>
+  </tr>
   % for my $rider (@{ $results }) {
   <tr>
     <td><%= $rider->{'number'} %></td>
     <td><%= $rider->{'rider_name'} %></td>
     <td><%= $rider->{'time'} %></td>
+    <td><%= $rider->{'points'} %></td>
   </tr>
   % }
 </table>
@@ -37,7 +44,6 @@
 <form class="form-inline" action="<%== url_for 'results_import' %>" method="post">
   <input type="hidden" name="stage" value="<%= $stage->{'stage'} %>" />
   <label for="url">URL:</label><input type="text" name="url" />
-  <label for="after_restday">After restday:</label><input type="checkbox" name="after_restday" value="1" />
   <input type="submit" value="Import" />
 </form>
 % }
@@ -108,7 +114,6 @@
 % if ($is_admin) {
 <form class="form-inline" action="<%== url_for 'points_calculate' %>" method="post">
   <input type="hidden" name="stage" value="<%= $stage->{'stage'} %>" />
-  <label for="after_restday">After restday:</label><input type="checkbox" name="after_restday" value="1" />
   <input type="submit" value="Calculate points" />
 </form>
 % }
-- 
2.47.3