From c4be7367f522b9c3fe51b46e83dcf7bd499e0e8b Mon Sep 17 00:00:00 2001 From: Andreas Kristiansen <6977712+AndreasK79@users.noreply.github.com> Date: Sun, 28 Sep 2025 12:07:41 +0200 Subject: [PATCH] [DXCC Award] Added new filter style --- application/models/Dxcc.php | 5 +- application/views/awards/dxcc/index.php | 363 ++++++++++++------------ assets/js/sections/dxccmap.js | 10 + 3 files changed, 194 insertions(+), 184 deletions(-) diff --git a/application/models/Dxcc.php b/application/models/Dxcc.php index 1d4e81ba0..b3ee94222 100644 --- a/application/models/Dxcc.php +++ b/application/models/Dxcc.php @@ -430,9 +430,8 @@ class DXCC extends CI_Model { * Function gets worked and confirmed summary on each band on the active stationprofile */ function get_dxcc_summary($bands, $postdata) { - $CI =& get_instance(); - $CI->load->model('logbooks_model'); - $logbooks_locations_array = $CI->logbooks_model->list_logbook_relationships($this->session->userdata('active_station_logbook')); + $this->load->model('logbooks_model'); + $logbooks_locations_array = $this->logbooks_model->list_logbook_relationships($this->session->userdata('active_station_logbook')); if (!$logbooks_locations_array) { return null; diff --git a/application/views/awards/dxcc/index.php b/application/views/awards/dxcc/index.php index 05fb57064..57ef24618 100644 --- a/application/views/awards/dxcc/index.php +++ b/application/views/awards/dxcc/index.php @@ -6,193 +6,194 @@ }
- -
-
- -

- -
- + +
+
+ +

+ +
+
-
+
+
+ + + + -
-
-
-
- input->post('includedeleted')) echo ' checked="checked"'; ?> > - -
-
-
- - -
-
-
-
- input->post('worked') || $this->input->method() !== 'post') echo ' checked="checked"'; ?> > - -
-
- input->post('confirmed') || $this->input->method() !== 'post') echo ' checked="checked"'; ?> > - -
-
- input->post('notworked') || $this->input->method() !== 'post') echo ' checked="checked"'; ?> > - -
-
-
- -
-
-
-
- input->post('qsl') || $this->input->method() !== 'post') echo ' checked="checked"'; ?> > - -
-
- input->post('lotw') || $this->input->method() !== 'post') echo ' checked="checked"'; ?> > - -
-
- input->post('eqsl')) echo ' checked="checked"'; ?> > - -
-
- input->post('qrz')) echo ' checked="checked"'; ?> > - -
-
- input->post('clublog')) echo ' checked="checked"'; ?> > - -
-
-
- -
-
-
-
- input->post('Antarctica') || $this->input->method() !== 'post') echo ' checked="checked"'; ?> > - -
-
- input->post('Africa') || $this->input->method() !== 'post') echo ' checked="checked"'; ?> > - -
-
- input->post('Asia') || $this->input->method() !== 'post') echo ' checked="checked"'; ?> > - -
-
- input->post('Europe') || $this->input->method() !== 'post') echo ' checked="checked"'; ?> > - -
-
- input->post('NorthAmerica') || $this->input->method() !== 'post') echo ' checked="checked"'; ?> > - -
-
- input->post('SouthAmerica') || $this->input->method() !== 'post') echo ' checked="checked"'; ?> > - -
-
- input->post('Oceania') || $this->input->method() !== 'post') echo ' checked="checked"'; ?> > - -
-
-
- -
- -
- -
-
-
input->post('band') != 'SAT' && $this->input->post('band') != 'All') echo "style=\"display: none\""; ?>> - - -
- + +
+
+
+
+
+
+ input->post('includedeleted')) echo ' checked="checked"'; ?> > + +
+
- - - + + +
+
+
+
+ input->post('worked') || $this->input->method() !== 'post') echo ' checked="checked"'; ?> > + +
+
+ input->post('confirmed') || $this->input->method() !== 'post') echo ' checked="checked"'; ?> > + +
+
+ input->post('notworked') || $this->input->method() !== 'post') echo ' checked="checked"'; ?> > + +
+
+
+ +
+
+
+
+ input->post('qsl') || $this->input->method() !== 'post') echo ' checked="checked"'; ?> > + +
+
+ input->post('lotw') || $this->input->method() !== 'post') echo ' checked="checked"'; ?> > + +
+
+ input->post('eqsl')) echo ' checked="checked"'; ?> > + +
+
+ input->post('qrz')) echo ' checked="checked"'; ?> > + +
+
+ input->post('clublog')) echo ' checked="checked"'; ?> > + +
+
+
+ +
+
+
+
+ input->post('Antarctica') || $this->input->method() !== 'post') echo ' checked="checked"'; ?> > + +
+
+ input->post('Africa') || $this->input->method() !== 'post') echo ' checked="checked"'; ?> > + +
+
+ input->post('Asia') || $this->input->method() !== 'post') echo ' checked="checked"'; ?> > + +
+
+ input->post('Europe') || $this->input->method() !== 'post') echo ' checked="checked"'; ?> > + +
+
+ input->post('NorthAmerica') || $this->input->method() !== 'post') echo ' checked="checked"'; ?> > + +
+
+ input->post('SouthAmerica') || $this->input->method() !== 'post') echo ' checked="checked"'; ?> > + +
+
+ input->post('Oceania') || $this->input->method() !== 'post') echo ' checked="checked"'; ?> > + +
+
+
+ +
+ +
+ +
+
+
input->post('band') != 'SAT' && $this->input->post('band') != 'All') echo "style=\"display: none\""; ?>> + + +
+ +
+ + + +
+
input->post('band') != 'SAT' && $this->input->post('band') != 'All') echo "style=\"display: none\""; ?>> + +
+ +
-
input->post('band') != 'SAT' && $this->input->post('band') != 'All') echo "style=\"display: none\""; ?>> - -
- +
+
+ +
+
-
-
- -
- -
-
- -
- -
- - - - -
-
- -
+
+
+ +
+