From 9ebdcebbb3578b3723dba3114bfb48fb2cdd7e53 Mon Sep 17 00:00:00 2001
From: Gregory Shikhman <cornmander@cornmander.com>
Date: Thu, 13 Aug 2009 22:45:56 +0000
Subject: [PATCH] Added filter selection to frontend.

Improved UI of killmaps page slightly.
---
 .../wesstats/controllers/killview.py          | 10 ++++++-
 .../wesstats/templates/killview.html          | 28 ++++++++++++++++++-
 2 files changed, 36 insertions(+), 2 deletions(-)

diff --git a/website/stats.wesnoth.org/wesstats/controllers/killview.py b/website/stats.wesnoth.org/wesstats/controllers/killview.py
index 9fb19f12cc4..f6635682987 100644
--- a/website/stats.wesnoth.org/wesstats/controllers/killview.py
+++ b/website/stats.wesnoth.org/wesstats/controllers/killview.py
@@ -101,6 +101,11 @@ class KillGraphController(BaseController):
 		#check for input sanity, we will be fetching map tiles based on this name
 		if not ( cur_map.isalnum() and len(cur_map) == 32):
 			cur_map = ""
+		cur_map_name = "None"
+		for map in maps:
+			if map[1] == cur_map:
+				cur_map_name = map[0]
+				break
 		
 		m_dimensions = ()
 		if cur_map != "":
@@ -125,4 +130,7 @@ class KillGraphController(BaseController):
 		return dict(maps=maps,cur_map=cur_map,dimensions=m_dimensions,
 			grid_colors=grid_colors,startdate="",enddate="",
 			minkillerlev="",maxkillerlev="",minkilledlev="",
-			maxkilledlev="")
+			maxkilledlev="",used_filters=used_filters,
+			ufilters_vals=ufilters_vals,
+			filters=available_filters+available_filters_map,
+			fdata=fdata,cur_map_name=cur_map_name)
diff --git a/website/stats.wesnoth.org/wesstats/templates/killview.html b/website/stats.wesnoth.org/wesstats/templates/killview.html
index 1cd2505679d..e6b89c4ba23 100644
--- a/website/stats.wesnoth.org/wesstats/templates/killview.html
+++ b/website/stats.wesnoth.org/wesstats/templates/killview.html
@@ -112,10 +112,36 @@
 	<div id="map_canvas" style="width: 800px; height: 600px"><noscript>You must enable Javascript in order to see the kill map.</noscript></div>
 <br />
 <div id="map_selection">
-Map
+Map: ${cur_map_name}
+<div id="used_filters">
+Used filters:
+<b py:if="len(used_filters) == 0">None</b>
+<table border="1">
+<tr py:for="filter in used_filters">
+<td>${filter}</td>
+<td py:for="val in ufilters_vals[filter]">
+${val}
+</td>
+</tr>
+</table>
+</div>
 <form method="get">
 <table border="1">
 <tr>
+<td py:for="filter in filters">
+${filter}
+</td>
+<td>
+map/scenario
+</td>
+</tr>
+<tr>
+<td py:for="filter in filters">
+<select name="${filter}" multiple="multiple" size="5">
+<option selected="1" py:for="item in sorted(fdata[filter])" py:if="used_filters.__contains__(filter) and ufilters_vals[filter].__contains__(item)">${item}</option>
+<option py:for="item in sorted(fdata[filter])" py:if="not (used_filters.__contains__(filter) and ufilters_vals[filter].__contains__(item))">${item}</option>
+</select>
+</td>
 <td>
 <select name="map" size="5">
 <option py:for="map in maps" value="${map[1]}">${map[0]}</option>