freifunk-franken
/
monitoring
mirror of https://github.com/FreifunkFranken/fff-monitoring.git
3
0
Fork 0
Code Issues Releases Wiki Activity

Respect case in database and code 

Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
This commit is contained in:
Adrian Schmutzler 2017-11-15 13:43:52 +01:00
parent 003fcbcebe
commit 9d167bdb86
7 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ffmap/db/hoods.py
View File

@ -11,7 +11,7 @@ mysql = FreifunkMySQL()
mysql.execute("""
CREATE TABLE hoods (
`id` int(11) NOT NULL,
`name` varchar(50) COLLATE utf8_unicode_ci NOT NULL,
`name` varchar(50) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL,
`net` varchar(30) COLLATE utf8_unicode_ci NOT NULL,
`lat` double DEFAULT NULL,
`lng` double DEFAULT NULL,

2
ffmap/db/routers.py
View File

@ -37,7 +37,7 @@ mysql.execute("""
`description` varchar(200) COLLATE utf8_unicode_ci NOT NULL,
`position_comment` varchar(200) COLLATE utf8_unicode_ci NOT NULL,
`community` varchar(200) COLLATE utf8_unicode_ci NOT NULL,
`hood` varchar(200) COLLATE utf8_unicode_ci DEFAULT NULL,
`hood` varchar(200) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL,
`status_text` varchar(200) COLLATE utf8_unicode_ci NOT NULL,
`contact` varchar(200) COLLATE utf8_unicode_ci NOT NULL,
`lng` double DEFAULT NULL,

2
ffmap/db/stats.py
View File

@ -25,7 +25,7 @@ mysql.execute("""
mysql.execute("""
CREATE TABLE stats_hood (
`hood` varchar(50) COLLATE utf8_unicode_ci NOT NULL,
`hood` varchar(50) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL,
`time` datetime NOT NULL,
`clients` int(11) NOT NULL,
`online` int(11) NOT NULL,

6
ffmap/db/users.py
View File

@ -11,9 +11,9 @@ mysql = FreifunkMySQL()
mysql.execute("""
CREATE TABLE `users` (
`id` int(11) NOT NULL,
`nickname` varchar(200) COLLATE utf8_unicode_ci NOT NULL,
`password` varchar(250) COLLATE utf8_unicode_ci DEFAULT NULL,
`token` varchar(250) COLLATE utf8_unicode_ci DEFAULT NULL,
`nickname` varchar(200) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL,
`password` varchar(250) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL,
`token` varchar(250) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL,
`email` varchar(200) COLLATE utf8_unicode_ci NOT NULL,
`created` datetime NOT NULL,
`admin` tinyint(4) NOT NULL DEFAULT '0'

4
ffmap/stattools.py
View File

@ -98,7 +98,7 @@ def hoods(mysql):
result = {}
for rs in data:
if not rs["hood"]:
rs["hood"] = "default"
rs["hood"] = "Default"
if not rs["hood"] in result:
result[rs["hood"]] = {}
result[rs["hood"]][rs["status"]] = rs["count"]
@ -113,7 +113,7 @@ def hoods_sum(mysql):
result = {}
for rs in data:
if not rs["hood"]:
rs["hood"] = "default"
rs["hood"] = "Default"
result[rs["hood"]] = {"routers": rs["count"], "clients": rs["clients"]}
return result

2
ffmap/web/application.py
View File

@ -147,7 +147,7 @@ def router_info(dbid):
@app.route('/users')
def user_list():
mysql = FreifunkMySQL()
users = mysql.fetchall("SELECT id, nickname, email, created, admin FROM users ORDER BY nickname ASC")
users = mysql.fetchall("SELECT id, nickname, email, created, admin FROM users ORDER BY nickname COLLATE utf8_unicode_ci ASC")
user_routers = stattools.router_user_sum(mysql)
mysql.close()
mysql.utcawaretuple(users,"created")

4
ffmap/web/templates/statistics.html
View File

@ -67,8 +67,8 @@
<td class="success">{{ value["online"] or 0 }}</td>
<td class="danger">{{ value["offline"] or 0 }}</td>
<td class="warning">{{ value["unknown"] or 0 }}</td>
<td class="active">{{ hoods_sum[hood]["routers"] or 0 }}</td>
<td class="info">{{ hoods_sum[hood]["clients"] or 0 }}</td>
<td class="active">{{ hoods_sum[hood]["routers"] }}</td>
<td class="info">{{ hoods_sum[hood]["clients"] }}</td>
<td class="stats"><a href="{{ url_for('global_hoodstatistics', selecthood='%s' % hood) }}">Hood</a></td>
</tr>
{%- endfor %}