new version

coulisse · Nov 11, 2023 · 85da257 · 85da257
2 parents 4ea31de + 70816cd
commit 85da257
Show file tree

Hide file tree

Showing 30 changed files with 1,644 additions and 1,455 deletions.
diff --git a/.gitignore b/.gitignore
@@ -4,3 +4,7 @@ config.json
 __init__/
 __pycache__/
 .vscode/
+*report.html
+venv/
+.idea/
+
diff --git a/CITATION.cff b/CITATION.cff
@@ -24,5 +24,10 @@ keywords:
   - dxcluster
   - spiderweb
 license: GPL-3.0
+<<<<<<< HEAD
 version: v2.4.2
 date-released: 2023-02-12
+=======
+version: v2.4.5
+date-released: 2023-11-11
+>>>>>>> staging
diff --git a/README.md b/README.md
@@ -3,14 +3,13 @@
 
 ### Ham radio cluster web viewer for DxSpider
 [![GPLv3 license](https://img.shields.io/badge/License-GPLv3-blue.svg)](http://perso.crans.org/besson/LICENSE.html)
-[![Linux](https://svgshare.com/i/Zhy.svg)](https://svgshare.com/i/Zhy.svg)
 [![made-with-python](https://img.shields.io/badge/B.e.-Python-1f425f.svg)](https://www.python.org/)
 [![made-with-javascript](https://img.shields.io/badge/F.e.-JavaScript-yellow)](https://www.javascript.com)
 [![bootstrap](https://img.shields.io/badge/CSS%20Fwk-Bootstrap-purple)](https://getbootstrap.com/)
 [![CodeFactor](https://www.codefactor.io/repository/github/coulisse/spiderweb/badge)](https://www.codefactor.io/repository/github/coulisse/spiderweb)
 
 
-- **Release:** v2.4.2
+- **Release:** v2.4.5
 - **Author:** Corrado Gerbaldo - [IU1BOW](https://www.qrz.com/db/IU1BOW)
 - **Mail:** <[email protected]>
 - **Licensing:** Gpl V3.0 see [LICENSE](LICENSE) file.

diff --git a/cfg/country.json b/cfg/country.json
@@ -71,9 +71,9 @@
         { "WPX": "60", "ISO": "fr", "desc": "French Guiana" },
         { "WPX": "61", "ISO": "gb", "desc": "England" },
         { "WPX": "62", "ISO": "im", "desc": "Isle of Man" },
-        { "WPX": "63", "ISO": "ie", "desc": "Northern Ireland" },
+        { "WPX": "63", "ISO": "gb-nir", "desc": "Northern Ireland" },
         { "WPX": "64", "ISO": "je", "desc": "Jersey" },
-        { "WPX": "65", "ISO": "gb", "desc": "Scotland" },
+        { "WPX": "65", "ISO": "gb-sct", "desc": "Scotland" },
         { "WPX": "66", "ISO": "gg", "desc": "Guernsey" },
         { "WPX": "67", "ISO": "gb", "desc": "Wales" },
         { "WPX": "68", "ISO": "sb", "desc": "Solomon Islands" },

diff --git a/cfg/modes.json b/cfg/modes.json
@@ -11,100 +11,103 @@
           "min": 3500.0,
           "max": 3569.9
         },
-	    {
+        {
           "min": 7000.0,
           "max": 7039.9
         },
-	    {
+        {
           "min": 10100.0,
           "max": 10129.9
         },
-	    {
+        {
           "min": 14000.0,
           "max": 14069.9
         },
-	    {
+        {
           "min": 18068.0,
           "max": 18099.9
         },
-	    {
+        {
           "min": 21000.0,
           "max": 21069.9
         },
-	    {
+        {
           "min": 24890.0,
           "max": 24914.9
         },
-	    {
+        {
           "min": 28000.0,
           "max": 28069.9
         },
-	    {
+        {
           "min": 50000.0,
+          "max": 50312.9
+        },
+        {
+          "min": 50314.0,
           "max": 50499.9
         },
-	    {
+        {
           "min": 51000.0,
           "max": 52000.0
         },
-		{
-			"min": 70030,
-			"max": 70250
-		},
-		{
-			"min": 144000,
-			"max": 144150
-		},
-		{
-			"min": 432000,
-			"max": 432150
-		},
-		{
-			"min": 1296000,
-			"max": 1296150
-		},
-		{
-			"min": 2320100,
-			"max": 2320150
-		},
-		{
-			"min": 3400000,
-			"max": 3402000
-		},
-		{
-			"min": 5668000,
-			"max": 5670000
-		},
-		{
-			"min": 5760000,
-			"max": 5762000
-		},
-		{
-			"min": 10368000,
-			"max": 10370000
-		},
-		{
-			"min": 10450000,
-			"max": 10452000
-		},
-		{
-			"min": 24048000,
-			"max": 24050000
-		},
-		{
-			"min": 47087000,
-			"max": 47089000
-		}
-
+        {
+          "min": 70030,
+          "max": 70250
+        },
+        {
+          "min": 144000,
+          "max": 144150
+        },
+        {
+          "min": 432000,
+          "max": 432150
+        },
+        {
+          "min": 1296000,
+          "max": 1296150
+        },
+        {
+          "min": 2320100,
+          "max": 2320150
+        },
+        {
+          "min": 3400000,
+          "max": 3402000
+        },
+        {
+          "min": 5668000,
+          "max": 5670000
+        },
+        {
+          "min": 5760000,
+          "max": 5762000
+        },
+        {
+          "min": 10368000,
+          "max": 10370000
+        },
+        {
+          "min": 10450000,
+          "max": 10452000
+        },
+        {
+          "min": 24048000,
+          "max": 24050000
+        },
+        {
+          "min": 47087000,
+          "max": 47089000
+        }
       ]
     },
-{
+    {
       "id": "digi",
       "freq": [
         {
           "min": 1840.0,
           "max": 1841.0
-        },	  
+        },
         {
           "min": 3570.0,
           "max": 3600.0
@@ -129,7 +132,7 @@
           "min": 21070.0,
           "max": 21100.0
         },
-		{
+        {
           "min": 21140.0,
           "max": 21141.0
         },
@@ -144,13 +147,17 @@
         {
           "min": 28180.0,
           "max": 28180.0
-        },		
+        },
+        {
+          "min": 50313.0,
+          "max": 50313.9
+        },
         {
           "min": 50500.0,
           "max": 51000.0
         }
       ]
-    },	
+    },
     {
       "id": "phone",
       "freq": [
@@ -177,7 +184,7 @@
         {
           "min": 21100.0,
           "max": 21139.0
-        },		
+        },
         {
           "min": 21141.0,
           "max": 21450.0
@@ -190,60 +197,59 @@
           "min": 28120.0,
           "max": 29700.0
         },
-		{
-			"min": 50100,
-			"max": 50500
-		},
-		{
-			"min": 70030,
-			"max": 70250
-		},
-		{
-			"min": 144150,
-			"max": 144500
-		},
-		{
-			"min": 432150,
-			"max": 432500
-		},
-		{
-			"min": 1296150,
-			"max": 1296800
-		},
-		{
-			"min": 2320150,
-			"max": 2320800
-		},
-		{
-			"min": 3400000,
-			"max": 3402000
-		},
-		{
-			"min": 5668000,
-			"max": 5670000
-		},
-		{
-			"min": 5760000,
-			"max": 5762000
-		},
-		{
-			"min": 10368000,
-			"max": 10370000
-		},
-		{
-			"min": 10450000,
-			"max": 10452000
-		},
-		{
-			"min": 24048000,
-			"max": 24050000
-		},
-		{
-			"min": 47087000,
-			"max": 47089000
-		}	
+        {
+          "min": 50100,
+          "max": 50500
+        },
+        {
+          "min": 70030,
+          "max": 70250
+        },
+        {
+          "min": 144150,
+          "max": 144500
+        },
+        {
+          "min": 432150,
+          "max": 432500
+        },
+        {
+          "min": 1296150,
+          "max": 1296800
+        },
+        {
+          "min": 2320150,
+          "max": 2320800
+        },
+        {
+          "min": 3400000,
+          "max": 3402000
+        },
+        {
+          "min": 5668000,
+          "max": 5670000
+        },
+        {
+          "min": 5760000,
+          "max": 5762000
+        },
+        {
+          "min": 10368000,
+          "max": 10370000
+        },
+        {
+          "min": 10450000,
+          "max": 10452000
+        },
+        {
+          "min": 24048000,
+          "max": 24050000
+        },
+        {
+          "min": 47087000,
+          "max": 47089000
+        }
       ]
-    }    
+    }
   ]
-}
-
+}
diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
@@ -1,5 +1,29 @@
 ### Change log
+<<<<<<< HEAD
 Date: 12/02/2023 
+=======
+Date: 11/11/2023 
+Release: v2.4.5
+- added "back to top" button
+- enancement request #44  :  added reset filter
+- fixed dependencie #32 : mysql connector
+- fixed FT8 frequency on CW 6 meter band #40
+- upgraded echarts library from 5.4.1 to 5.4.3
+- upgraded flag icons library from 6.6.0 to 6.15
+- upgraded bootstrap to 5.2.3
+
+___
+Date: 26/02/2023 
+Release: v2.4.4
+- replaced multipart form post with url encoded for security reasons
+- fixed bands and continents in band activity chart
+- upgraded Werkzeug to 2.2.3
+- changed some api call from get to post method in order to not caching it
+- fixed flags of Scothland and Northern Ireland
+
+___
+Date: 11/02/2023 
+>>>>>>> staging
 Release: v2.4.2
 - changed cache-control header
 - fixed Layout scrolling (SEO)