From 686850b2a3a54d48197d8add808bfb424955f3cf Mon Sep 17 00:00:00 2001 From: Marat Fayzullin Date: Sat, 20 Jan 2024 23:07:18 -0500 Subject: [PATCH] Further improving EIBI schedules display. --- htdocs/lib/MapMarkers.js | 10 ++++++---- owrx/markers.py | 18 +++++++++--------- 2 files changed, 15 insertions(+), 13 deletions(-) diff --git a/htdocs/lib/MapMarkers.js b/htdocs/lib/MapMarkers.js index ad207bf6..77b31710 100644 --- a/htdocs/lib/MapMarkers.js +++ b/htdocs/lib/MapMarkers.js @@ -303,10 +303,12 @@ FeatureMarker.prototype.getInfoHTML = function(name, receiverMarker = null) { if (this.schedule) { var odd = false; var list = this.schedule.map(function(x) { - var row = '' + ('0000' + x.time1).slice(-4) + '‑' + ('0000' + x.time2).slice(-4) + '' + x.name + '' diff --git a/owrx/markers.py b/owrx/markers.py index c1725d2c..f3a421e7 100644 --- a/owrx/markers.py +++ b/owrx/markers.py @@ -306,15 +306,15 @@ class Markers(object): targets = {} comment = "" langstr = "" - for row in schedule: - lang = row["lang"] - target = row["tgt"] - if target and target not in targets: - targets[target] = True - comment += (", " if comment else " to ") + target - if lang and lang not in langs: - langs[lang] = True - langstr += (", " if langstr else "") + re.sub(r"(:|\s*\().*$", "", lang) +# for row in schedule: +# lang = row["lang"] +# target = row["tgt"] +# if target and target not in targets: +# targets[target] = True +# comment += (", " if comment else " to ") + target +# if lang and lang not in langs: +# langs[lang] = True +# langstr += (", " if langstr else "") + re.sub(r"(:|\s*\().*$", "", lang) # Compose comment comment = ("Transmitting" + comment) if comment else "Transmitter"