From 658641e51b9df2b7b8972e891a261037b3380850 Mon Sep 17 00:00:00 2001
From: Andreas <6977712+AndreasK79@users.noreply.github.com>
Date: Sun, 2 May 2021 17:25:59 +0200
Subject: [PATCH] [WAS Map] Added JS from this fork
https://github.com/kcaran/us-map to enable labels on all states. Made a minor
tweak to show popup with QSOs from clicked state. Tooltip is available, but
disabled right now.
---
application/models/Logbook_model.php | 14 ++--
application/views/awards/was/map.php | 114 +++++++++++++++++++++------
assets/js/jquery.usmap.min.js | 1 +
3 files changed, 99 insertions(+), 30 deletions(-)
create mode 100644 assets/js/jquery.usmap.min.js
diff --git a/application/models/Logbook_model.php b/application/models/Logbook_model.php
index 7fc8bb0a..40e5db32 100755
--- a/application/models/Logbook_model.php
+++ b/application/models/Logbook_model.php
@@ -346,12 +346,14 @@ class Logbook_model extends CI_Model {
$this->db->where('station_id', $station_id);
$this->db->where('COL_STATE', $state);
$this->db->where_in('COL_DXCC', ['291', '6', '110']);
- if($band != "SAT") {
- $this->db->where('COL_PROP_MODE !=', 'SAT');
- $this->db->where('COL_BAND', $band);
- } else {
- $this->db->where('COL_PROP_MODE', "SAT");
- }
+ if($band != 'All') {
+ if($band != "SAT") {
+ $this->db->where('COL_PROP_MODE !=', 'SAT');
+ $this->db->where('COL_BAND', $band);
+ } else {
+ $this->db->where('COL_PROP_MODE', "SAT");
+ }
+ }
return $this->db->get($this->config->item('table_name'));
}
diff --git a/application/views/awards/was/map.php b/application/views/awards/was/map.php
index a47d3830..1c9c7a0d 100644
--- a/application/views/awards/was/map.php
+++ b/application/views/awards/was/map.php
@@ -2,7 +2,7 @@
US Map Demo
-
+
-
+
-
-
+
+
+
- Red - Not Worked
diff --git a/assets/js/jquery.usmap.min.js b/assets/js/jquery.usmap.min.js
new file mode 100644
index 00000000..5d76a688
--- /dev/null
+++ b/assets/js/jquery.usmap.min.js
@@ -0,0 +1 @@
+(function($,document,window,Raphael,undefined){function jQueryPluginFactory($,name,methods,getters){getters=getters instanceof Array?getters:[];var getters_obj={};for(var i=0;i