From: Michael Tremer Date: Tue, 30 Oct 2018 12:37:29 +0000 (+0000) Subject: fireinfo: Drop language and network stats X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=23f0179e2c40cfa86d7ccee4509c0eedd3b18e8f;p=ipfire.org.git fireinfo: Drop language and network stats Signed-off-by: Michael Tremer --- diff --git a/Makefile.am b/Makefile.am index b81d7187..a05d730c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -146,9 +146,7 @@ templates_fireinfo_DATA = \ src/templates/fireinfo/stats-cpus.html \ src/templates/fireinfo/stats-geo.html \ src/templates/fireinfo/stats.html \ - src/templates/fireinfo/stats-languages.html \ src/templates/fireinfo/stats-memory.html \ - src/templates/fireinfo/stats-network.html \ src/templates/fireinfo/stats-oses.html \ src/templates/fireinfo/vendor.html \ src/templates/fireinfo/vendors.html diff --git a/src/backend/fireinfo.py b/src/backend/fireinfo.py index 759b8735..8c76da1c 100644 --- a/src/backend/fireinfo.py +++ b/src/backend/fireinfo.py @@ -1813,14 +1813,6 @@ class Fireinfo(Object): return ((r.location, r.count) for r in res) - def get_language_map(self, when=None): - res = self.db.query("WITH profiles AS (SELECT fireinfo_profiles_with_data_at(%s) AS id) \ - SELECT language, COUNT(language)::float / (SELECT COUNT(*) FROM profiles) AS count FROM profiles \ - LEFT JOIN fireinfo_profiles_languages ON profiles.id = fireinfo_profiles_languages.profile_id \ - WHERE fireinfo_profiles_languages.language IS NOT NULL GROUP BY language ORDER BY count DESC", when) - - return ((r.language, r.count) for r in res) - @property def cpu_vendors(self): res = self.db.query("SELECT DISTINCT vendor FROM fireinfo_processors ORDER BY vendor") @@ -2053,14 +2045,3 @@ class Fireinfo(Object): GROUP BY subsystem, model, vendor, driver, deviceclass", when, IGNORED_DEVICES, subsystem, vendor) return self._process_devices(res) - - def get_network_zones_map(self, when=None): - res = self.db.get("WITH profiles AS (SELECT fireinfo_profiles_with_data_at(%s) AS id) \ - SELECT COUNT(NULLIF(has_red, FALSE))::float / (SELECT COUNT(*) FROM profiles) AS has_red, \ - COUNT(NULLIF(has_green, FALSE))::float / (SELECT COUNT(*) FROM profiles) AS has_green, \ - COUNT(NULLIF(has_orange, FALSE))::float / (SELECT COUNT(*) FROM profiles) AS has_orange, \ - COUNT(NULLIF(has_blue, FALSE))::float / (SELECT COUNT(*) FROM profiles) AS has_blue FROM profiles \ - LEFT JOIN fireinfo_profiles_networks ON profiles.id = fireinfo_profiles_networks.profile_id \ - WHERE fireinfo_profiles_networks.profile_id IS NOT NULL", when) - - return res diff --git a/src/templates/fireinfo/stats-languages.html b/src/templates/fireinfo/stats-languages.html deleted file mode 100644 index 6060353e..00000000 --- a/src/templates/fireinfo/stats-languages.html +++ /dev/null @@ -1,16 +0,0 @@ -{% extends "../base.html" %} - -{% block title %}{{ _("Languages") }}{% end block %} - -{% block body %} -
-

{{ _("Languages") }}

-
- -
- {% for language, percentage in languages %} -
{% module LanguageName(language) %}
-
{% module ProgressBar(percentage) %}
- {% end %} -
-{% end block %} diff --git a/src/templates/fireinfo/stats-network.html b/src/templates/fireinfo/stats-network.html deleted file mode 100644 index 4aa2bc6a..00000000 --- a/src/templates/fireinfo/stats-network.html +++ /dev/null @@ -1,28 +0,0 @@ -{% extends "../base.html" %} - -{% block title %}{{ _("Networking") }}{% end block %} - -{% block body %} -
-

{{ _("Network configuration") }}

-
- -

- This chart shows us which is the most favourite network configuration. -

- -
-
{{ _("RED") }}
-
{% module ProgressBar(network.has_red) %}
- -
{{ _("GREEN") }}
-
{% module ProgressBar(network.has_green) %}
- -
{{ _("ORANGE") }}
-
{% module ProgressBar(network.has_orange) %}
- -
{{ _("BLUE") }}
-
{% module ProgressBar(network.has_blue) %}
-
-{% end block %} - diff --git a/src/templates/fireinfo/stats.html b/src/templates/fireinfo/stats.html index 4f703858..b7f2c302 100644 --- a/src/templates/fireinfo/stats.html +++ b/src/templates/fireinfo/stats.html @@ -15,10 +15,6 @@

{{ _("IPFire Releases") }}

- -

- {{ _("Networking") }} -

@@ -41,10 +37,6 @@

{{ _("Geo Locations") }}

- -

- {{ _("Languages") }} -

diff --git a/src/web/__init__.py b/src/web/__init__.py index 0041ab4b..4cca0adc 100644 --- a/src/web/__init__.py +++ b/src/web/__init__.py @@ -80,9 +80,7 @@ class Application(tornado.web.Application): # Nopaste "Code" : nopaste.CodeModule, - # Old modules - "LanguageName" : ui_modules.LanguageNameModule, - + # Fireinfo "ProgressBar" : ui_modules.ProgressBarModule, "FireinfoDeviceTable" : fireinfo.DeviceTableModule, "FireinfoDeviceAndGroupsTable" : fireinfo.DeviceAndGroupsTableModule, @@ -205,9 +203,7 @@ class Application(tornado.web.Application): (r"/statistics/processors", fireinfo.StatsProcessorsHandler), (r"/statistics/processors/(arm|x86)", fireinfo.StatsProcessorDetailHandler), (r"/statistics/geo-locations", fireinfo.StatsGeoHandler), - (r"/statistics/languages", fireinfo.StatsLanguagesHandler), (r"/statistics/memory", fireinfo.StatsMemoryHandler), - (r"/statistics/networking", fireinfo.StatsNetworkingHandler), (r"/statistics/releases", fireinfo.StatsReleasesHandler), ]) diff --git a/src/web/fireinfo.py b/src/web/fireinfo.py index 03b28a61..5a48f58e 100644 --- a/src/web/fireinfo.py +++ b/src/web/fireinfo.py @@ -259,19 +259,6 @@ class StatsGeoHandler(BaseHandler): geo_locations = self.fireinfo.get_geo_location_map(when=self.when)) -class StatsLanguagesHandler(BaseHandler): - def get(self): - return self.render("fireinfo/stats-languages.html", - languages = self.fireinfo.get_language_map(when=self.when)) - - -class StatsNetworkingHandler(BaseHandler): - def get(self): - network=self.fireinfo.get_network_zones_map(when=self.when) - - return self.render("fireinfo/stats-network.html", network=network) - - class VendorsHandler(BaseHandler): def get(self): vendors = self.fireinfo.get_vendor_list(when=self.when) diff --git a/src/web/ui_modules.py b/src/web/ui_modules.py index 07f09589..e50d1ac8 100644 --- a/src/web/ui_modules.py +++ b/src/web/ui_modules.py @@ -10,34 +10,6 @@ class UIModule(tornado.web.UIModule): return self.handler.backend -class LanguageNameModule(UIModule): - def render(self, language): - _ = self.locale.translate - - if language == "de": - return _("German") - elif language == "en": - return _("English") - elif language == "es": - return _("Spanish") - elif language == "fr": - return _("French") - elif language == "it": - return _("Italian") - elif language == "nl": - return _("Dutch") - elif language == "pl": - return _("Polish") - elif language == "pt": - return _("Portuguese") - elif language == "ru": - return _("Russian") - elif language == "tr": - return _("Turkish") - - return language - - class MapModule(UIModule): def render(self, latitude, longitude): return self.render_string("modules/map.html", latitude=latitude, longitude=longitude)