From 088a4828ed6bf3161acbfaa6be4cdba1e75c4656 Mon Sep 17 00:00:00 2001 From: phl0 Date: Wed, 31 Jan 2024 11:47:37 +0100 Subject: [PATCH 1/3] Show all unconfirmed if no QSL method is selected --- application/controllers/Gridmap.php | 2 +- application/models/Gridmap_model.php | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/application/controllers/Gridmap.php b/application/controllers/Gridmap.php index 07590626..922e987c 100644 --- a/application/controllers/Gridmap.php +++ b/application/controllers/Gridmap.php @@ -173,7 +173,7 @@ class Gridmap extends CI_Controller { } } - $data['grid_2char_confirmed'] = ($array_grid_2char_confirmed); + $data['grid_2char_confirmed'] = ($array_grid_2char_confirmed); $data['grid_4char_confirmed'] = ($array_grid_4char_confirmed); $data['grid_6char_confirmed'] = ($array_grid_6char_confirmed); diff --git a/application/models/Gridmap_model.php b/application/models/Gridmap_model.php index 067545c3..0e38a3be 100644 --- a/application/models/Gridmap_model.php +++ b/application/models/Gridmap_model.php @@ -13,6 +13,10 @@ class Gridmap_model extends CI_Model { return null; } + if ($lotw != "true" && $qsl != "true" && $eqsl != "true" && $qrz != "true") { + return null; + } + $location_list = "'".implode("','",$logbooks_locations_array)."'"; $sql = 'SELECT distinct substring(COL_GRIDSQUARE,1,6) as GRID_SQUARES, COL_BAND FROM ' @@ -129,6 +133,11 @@ class Gridmap_model extends CI_Model { return null; } + + if ($lotw != "true" && $qsl != "true" && $eqsl != "true" && $qrz != "true") { + return null; + } + $location_list = "'".implode("','",$logbooks_locations_array)."'"; $sql = 'SELECT distinct COL_VUCC_GRIDS, COL_BAND FROM ' From b24c318eaf81dd239fd68ca3927fe02519e2a5a9 Mon Sep 17 00:00:00 2001 From: phl0 Date: Wed, 31 Jan 2024 12:28:20 +0100 Subject: [PATCH 2/3] Revert "Show all unconfirmed if no QSL method is selected" This reverts commit 088a4828ed6bf3161acbfaa6be4cdba1e75c4656. --- application/controllers/Gridmap.php | 2 +- application/models/Gridmap_model.php | 9 --------- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/application/controllers/Gridmap.php b/application/controllers/Gridmap.php index 922e987c..07590626 100644 --- a/application/controllers/Gridmap.php +++ b/application/controllers/Gridmap.php @@ -173,7 +173,7 @@ class Gridmap extends CI_Controller { } } - $data['grid_2char_confirmed'] = ($array_grid_2char_confirmed); + $data['grid_2char_confirmed'] = ($array_grid_2char_confirmed); $data['grid_4char_confirmed'] = ($array_grid_4char_confirmed); $data['grid_6char_confirmed'] = ($array_grid_6char_confirmed); diff --git a/application/models/Gridmap_model.php b/application/models/Gridmap_model.php index 0e38a3be..067545c3 100644 --- a/application/models/Gridmap_model.php +++ b/application/models/Gridmap_model.php @@ -13,10 +13,6 @@ class Gridmap_model extends CI_Model { return null; } - if ($lotw != "true" && $qsl != "true" && $eqsl != "true" && $qrz != "true") { - return null; - } - $location_list = "'".implode("','",$logbooks_locations_array)."'"; $sql = 'SELECT distinct substring(COL_GRIDSQUARE,1,6) as GRID_SQUARES, COL_BAND FROM ' @@ -133,11 +129,6 @@ class Gridmap_model extends CI_Model { return null; } - - if ($lotw != "true" && $qsl != "true" && $eqsl != "true" && $qrz != "true") { - return null; - } - $location_list = "'".implode("','",$logbooks_locations_array)."'"; $sql = 'SELECT distinct COL_VUCC_GRIDS, COL_BAND FROM ' From be1327f53a816542950d54c15cd7e5ec746d1c34 Mon Sep 17 00:00:00 2001 From: phl0 Date: Wed, 31 Jan 2024 12:29:19 +0100 Subject: [PATCH 3/3] (Much) easier approach --- application/models/Gridmap_model.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/application/models/Gridmap_model.php b/application/models/Gridmap_model.php index 067545c3..56047f3b 100644 --- a/application/models/Gridmap_model.php +++ b/application/models/Gridmap_model.php @@ -177,7 +177,10 @@ class Gridmap_model extends CI_Model { $sql .= " or col_qrzcom_qso_download_status = 'Y'"; } if ($sql != '') { - $sql='and (1=0 '.$sql.')'; + $sql=' and (1=0 '.$sql.')'; + } + if ($sql == '') { + $sql=' and 1=0'; } return $sql; }