fix issue #29

coulisse · Jan 23, 2023 · db879c0 · db879c0
1 parent dd615e0
commit db879c0
Show file tree

Hide file tree

Showing 10 changed files with 26 additions and 19 deletions.
diff --git a/README.md b/README.md
@@ -10,7 +10,7 @@
 [![CodeFactor](https://www.codefactor.io/repository/github/coulisse/spiderweb/badge)](https://www.codefactor.io/repository/github/coulisse/spiderweb)
 
 
-- **Release:** v2.4.1
+- **Release:** v2.4.1.1
 - **Author:** Corrado Gerbaldo - [IU1BOW](https://www.qrz.com/db/IU1BOW)
 - **Mail:** <[email protected]>
 - **Licensing:** Gpl V3.0 see [LICENSE](LICENSE) file.

diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
@@ -1,5 +1,10 @@
 ### Change log
-Date: 20/01/2023 
+Date: 23/01/2023 
+Release: v2.4.1.1
+- fixed issue #29  bug on callsign search
+
+___
+Date: 19/01/2023 
 Release: v2.4.1
 - changed dimensions of spots in world dx spost charts
 - managed empty data in data providers for charts

diff --git a/scripts/build.sh b/scripts/build.sh
@@ -150,7 +150,8 @@ fi
 #fi
 
 echo 'get version from git'
-if ! ver=$(git describe --tags --abbrev=0)
+#if ! ver=$(git describe --tags --abbrev=0)
+if ! ver=$(git tag|tail -1)
 then
 	echo 'ERROR on get version from git'
 	exit 10

diff --git a/static/html/rel/offline.html b/static/html/rel/offline.html
@@ -10,8 +10,6 @@
 
 	<meta charset="utf-8">
 	<meta name="description" content="Web Ham Radio DX Cluster and spot search">
-	<meta name="keywords"
-		content="ham radio, dx cluster, dx spots, cluster sposts,web dx cluster,dx cluster search, DX spots">
 	<meta name="author" content="Corrado Gerbaldo - IU1BOW">
 	<meta name="viewport" content="width=device-width, initial-scale=1">
 	<meta name="theme-color" content="#2196f3">
@@ -103,7 +101,7 @@ <h2 class="display-4">No internet connection</h2>
 			<span class="copyleft">&copy;</span> Copyleft:
 			<span id="copyDate"></span>
 			<a href="https://github.com/coulisse/spiderweb/" target="blank" rel="noopener">IU1BOW Spiderweb</a>
-			<span id="version">v2.4.1</span>
+			<span id="version">v2.4.1.1</span>
 		</div>
 	</footer>
 	<script async src="static/js/rel/load-sw.min.js"></script>

diff --git a/static/js/dev/callsign_inline.js b/static/js/dev/callsign_inline.js
@@ -5,12 +5,14 @@
 //var my_adxo_events=jQuery.parseJSON(my_adxo_events_json.replaceAll("\t",""));
 var my_adxo_events = JSON.parse(my_adxo_events_json.replaceAll('\t', ''));
 
-var qryString = 'spotlist?c=' + my_callsign;
+//var qryString = 'spotlist?c=' + my_callsign;
+var qryString = 'spotlist?c=' + callsign;
 fetch(qryString)
 	.then((response) => response.json())
 	.then((data) => {
 		try {
-			tb.build(data, my_callsign);
+			//tb.build(data, my_callsign);
+			tb.build(data, callsign);
 		} catch (err) {
 			console.log(err);
 			console.log(err.stack);

diff --git a/static/js/rel/callsign_inline.min.js b/static/js/rel/callsign_inline.min.js
diff --git a/static/manifest.webmanifest b/static/manifest.webmanifest
@@ -1,5 +1,5 @@
 {
-  "name": "IU1BOW DXCluster v2.4.1",
+  "name": "IU1BOW DXCluster v2.4.1.1",
   "description": "DXCluser for ham radio by IU1BOW",
   "short_name": "IU1BOW DX",
   "theme_color": "#2196f3",

diff --git a/templates/_base.html b/templates/_base.html
@@ -7,8 +7,6 @@
 	{% block head %}
 	<meta charset="utf-8">
 	<meta name="description" content="Web Ham Radio DX Cluster and spot search">
-	<meta name="keywords"
-		content="ham radio, dx cluster, dx spots, cluster sposts,web dx cluster,dx cluster search, DX spots">
 	<meta name="author" content="Corrado Gerbaldo - IU1BOW">
 	<meta name="viewport" content="width=device-width, initial-scale=1">
 	<meta name="theme-color" content="#2196f3">
@@ -100,7 +98,7 @@
 			<span class="copyleft">&copy;</span> Copyleft:
 			<span id="copyDate"></span>
 			<a href="https://github.com/coulisse/spiderweb/" target="blank" rel="noopener">IU1BOW Spiderweb</a>
-			<span id="version">v2.4.1</span>
+			<span id="version">v2.4.1.1</span>
 		</div>
 	</footer>
 	<script async src="static/js/rel/load-sw.min.js"></script>

diff --git a/templates/callsign.html b/templates/callsign.html
@@ -1,5 +1,4 @@
 {% extends "index.html" %}
-
 <head>
 	{% block title %}
 	<title>Spot search for a specific Callsign</title>
@@ -10,8 +9,12 @@ <h1 class="display-4 text-white">{{callsign}}</h1>
 <p class="lead text-light">Some statistics about this callsign</p>
 {% endblock %}
 {% block filters %}
-<div class="row  mx-auto">
-	{% endblock filters %}
-	{% block inline_scripts %}
+	<div class="row  mx-auto">
+{% endblock filters %}
+{% block app_data %}
+	{{ super() }}
+	var callsign = '{{callsign}}';
+{% endblock app_data %}
+{% block inline_scripts %}
 	<script defer src="static/js/rel/callsign_inline.min.js"></script>
-	{% endblock %}
+{% endblock %}
diff --git a/templates/privacy.html b/templates/privacy.html
@@ -16,7 +16,7 @@ <h1 class="display-4 text-white">PRIVACY</h1>
 {% endblock %}
 {% block contents %}
 <div class="col mr-3 px-2">
-	<h1>Privacy Policy for this web site</h1>
+	<h2>Privacy Policy for this web site</h2>
 	<p>At this web site, one of our main priorities is the privacy of our visitors. This Privacy Policy document
 		contains types of information that is collected and recorded by this web site and how we use it.</p>
 	<p>If you have additional questions or require more information about our Privacy Policy, do not hesitate to contact