From ce7f62130ddf6aa9b0ac977ebdee187a8d455655 Mon Sep 17 00:00:00 2001 From: Andreas Kristiansen <6977712+AndreasK79@users.noreply.github.com> Date: Wed, 11 Mar 2026 11:22:14 +0100 Subject: [PATCH 1/2] [WAC Award] Query speedup --- application/controllers/Awards.php | 38 +- application/models/Wac.php | 474 +++++++++++++------------ application/views/awards/wac/index.php | 185 +++++----- assets/js/sections/wac.js | 21 ++ 4 files changed, 394 insertions(+), 324 deletions(-) create mode 100644 assets/js/sections/wac.js diff --git a/application/controllers/Awards.php b/application/controllers/Awards.php index 4f0ae8356..8898bcc9b 100644 --- a/application/controllers/Awards.php +++ b/application/controllers/Awards.php @@ -498,7 +498,6 @@ class Awards extends CI_Controller { public function vucc_band(){ $this->load->model('vucc'); - $data['user_map_custom'] = $this->optionslib->get_map_custom(); $band = str_replace('"', "", $this->security->xss_clean($this->input->get("Band"))); $type = str_replace('"', "", $this->security->xss_clean($this->input->get("Type"))); $data['vucc_array'] = $this->vucc->vucc_details($band, $type); @@ -2209,30 +2208,34 @@ class Awards extends CI_Controller { $data['bands'] = $bands; // Used for displaying selected band(s) in the table in the view if($this->input->method() === 'post') { - $postdata['qsl'] = $this->security->xss_clean($this->input->post('qsl')); - $postdata['lotw'] = $this->security->xss_clean($this->input->post('lotw')); - $postdata['eqsl'] = $this->security->xss_clean($this->input->post('eqsl')); - $postdata['qrz'] = $this->security->xss_clean($this->input->post('qrz')); - $postdata['worked'] = $this->security->xss_clean($this->input->post('worked')); - $postdata['confirmed'] = $this->security->xss_clean($this->input->post('confirmed')); - $postdata['notworked'] = $this->security->xss_clean($this->input->post('notworked')); + $postdata['qsl'] = ($this->input->post('qsl',true) ?? 0) == 0 ? NULL: 1; + $postdata['lotw'] = ($this->input->post('lotw',true) ?? 0) == 0 ? NULL: 1; + $postdata['eqsl'] = ($this->input->post('eqsl',true) ?? 0) == 0 ? NULL: 1; + $postdata['qrz'] = ($this->input->post('qrz',true) ?? 0) == 0 ? NULL: 1; + $postdata['clublog'] = ($this->input->post('clublog',true) ?? 0) == 0 ? NULL: 1; $postdata['band'] = $this->security->xss_clean($this->input->post('band')); $postdata['mode'] = $this->security->xss_clean($this->input->post('mode')); $postdata['sat'] = $this->security->xss_clean($this->input->post('sats')); $postdata['orbit'] = $this->security->xss_clean($this->input->post('orbits')); + $postdata['worked'] = ($this->input->post('worked',true) ?? 0) == 0 ? NULL: 1; + $postdata['confirmed'] = ($this->input->post('confirmed',true) ?? 0) == 0 ? NULL: 1; + $postdata['notworked'] = ($this->input->post('notworked',true) ?? 0) == 0 ? NULL: 1; + $postdata['band'] = $this->security->xss_clean($this->input->post('band')); } else { // Setting default values at first load of page $postdata['qsl'] = 1; $postdata['lotw'] = 1; - $postdata['eqsl'] = 0; - $postdata['qrz'] = 0; - $postdata['worked'] = 1; - $postdata['confirmed'] = 1; - $postdata['notworked'] = 1; + $postdata['eqsl'] = null; + $postdata['qrz'] = null; + $postdata['clublog'] = null; $postdata['band'] = 'All'; $postdata['mode'] = 'All'; $postdata['sat'] = 'All'; $postdata['orbit'] = 'All'; + $postdata['worked'] = 1; + $postdata['confirmed'] = 1; + $postdata['notworked'] = 1; + $postdata['band'] = 'All'; } if ($logbooks_locations_array) { @@ -2245,11 +2248,18 @@ class Awards extends CI_Controller { $data['wac_summary'] = null; } + $data['posted_band'] = $postdata['band']; + + $footerData = []; + $footerData['scripts'] = [ + 'assets/js/sections/wac.js', + ]; + // Render page $data['page_title'] = sprintf(__("Awards - %s"), __("Worked All Continents (WAC)")); $this->load->view('interface_assets/header', $data); $this->load->view('awards/wac/index'); - $this->load->view('interface_assets/footer'); + $this->load->view('interface_assets/footer', $footerData); } public function wae () { diff --git a/application/models/Wac.php b/application/models/Wac.php index f3bc23da4..9fb271a5f 100644 --- a/application/models/Wac.php +++ b/application/models/Wac.php @@ -2,265 +2,277 @@ class Wac extends CI_Model{ - private $validContinents = ['AF', 'EU', 'AS', 'SA', 'NA', 'OC', 'AN']; + private $validContinents = ['AF', 'AN', 'AS', 'EU', 'NA', 'OC', 'SA']; function __construct() { - $this->load->library('Genfunctions'); + if(!$this->load->is_loaded('Genfunctions')) { + $this->load->library('Genfunctions'); + } + } + + /* + * Gets all WAC data with confirmation status in efficient query using MAX aggregation + */ + function getWacData($location_list, $postdata) { + $bindings = []; + $sql = "SELECT thcv.col_cont, thcv.col_band, + MAX(case when thcv.col_lotw_qsl_rcvd ='Y' then 1 else 0 end) as lotw, + MAX(case when thcv.col_qsl_rcvd = 'Y' then 1 else 0 end) as qsl, + MAX(case when thcv.col_eqsl_qsl_rcvd = 'Y' then 1 else 0 end) as eqsl, + MAX(case when thcv.COL_QRZCOM_QSO_DOWNLOAD_STATUS= 'Y' then 1 else 0 end) as qrz, + MAX(case when thcv.COL_CLUBLOG_QSO_DOWNLOAD_STATUS = 'Y' then 1 else 0 end) as clublog + FROM " . $this->config->item('table_name') . " thcv + WHERE station_id IN (" . $location_list . ") + AND thcv.col_cont IN ('AF', 'EU', 'AS', 'SA', 'NA', 'OC', 'AN') + AND thcv.col_cont != ''"; + + // Mode filter + if ($postdata['mode'] != 'All') { + $sql .= " AND (thcv.col_mode = ? OR thcv.col_submode = ?)"; + $bindings[] = $postdata['mode']; + $bindings[] = $postdata['mode']; + } + + $sql .= " AND thcv.col_prop_mode != 'SAT'"; + + $sql .= " GROUP BY thcv.col_cont, thcv.col_band"; + + $query = $this->db->query($sql, $bindings); + return $query->result(); + } + + /* + * Gets all WAC satellite data with confirmation status + */ + function getWacDataSat($location_list, $postdata) { + $bindings = []; + $sql = "SELECT thcv.col_cont, 'SAT' as col_band, + MAX(case when thcv.col_lotw_qsl_rcvd ='Y' then 1 else 0 end) as lotw, + MAX(case when thcv.col_qsl_rcvd = 'Y' then 1 else 0 end) as qsl, + MAX(case when thcv.col_eqsl_qsl_rcvd = 'Y' then 1 else 0 end) as eqsl, + MAX(case when thcv.COL_QRZCOM_QSO_DOWNLOAD_STATUS= 'Y' then 1 else 0 end) as qrz, + MAX(case when thcv.COL_CLUBLOG_QSO_DOWNLOAD_STATUS = 'Y' then 1 else 0 end) as clublog + FROM " . $this->config->item('table_name') . " thcv + LEFT JOIN satellite on thcv.COL_SAT_NAME = satellite.name + WHERE station_id IN (" . $location_list . ") + AND thcv.col_cont IN ('AF', 'EU', 'AS', 'SA', 'NA', 'OC', 'AN') + AND thcv.col_cont != ''"; + + // Mode filter + if ($postdata['mode'] != 'All') { + $sql .= " AND (thcv.col_mode = ? OR thcv.col_submode = ?)"; + $bindings[] = $postdata['mode']; + $bindings[] = $postdata['mode']; + } + + // Satellite filter + if ($postdata['sat'] != 'All') { + $sql .= " AND thcv.col_sat_name = ?"; + $bindings[] = $postdata['sat']; + } + + // Orbit filter + $sql .= $this->addOrbitToQuery($postdata, $bindings); + + $sql .= " AND thcv.col_prop_mode = 'SAT'"; + + $sql .= " GROUP BY thcv.col_cont"; + + $query = $this->db->query($sql, $bindings); + return $query->result(); } function get_wac_array($bands, $postdata, $location_list) { - $wac = array(); - - foreach ($this->validContinents as $cont) { - $wac[$cont]['count'] = 0; // Inits each wac's count - } - $qsl = $this->genfunctions->gen_qsl_from_postdata($postdata); + // Initialize matrix with all continents + foreach ($this->validContinents as $cont) { + foreach ($bands as $band) { + if (($postdata['band'] != 'SAT') && ($band == 'SAT')) { + continue; + } + $wacMatrix[$cont][$band] = '-'; + } + } + + // Initialize summary counters foreach ($bands as $band) { - foreach ($this->validContinents as $cont) { - $bandWac[$cont][$band] = '-'; // Sets all to dash to indicate no result + if (($postdata['band'] != 'SAT') && ($band == 'SAT')) { + continue; + } + $summary['worked'][$band] = 0; + $summary['confirmed'][$band] = 0; + } + $summary['worked']['Total'] = 0; + $summary['confirmed']['Total'] = 0; + + // Track unique continent/band combinations + $workedContinents = []; // [band][continent] => true + $confirmedContinents = []; // [band][continent] => true + + // Track worked status for each continent + $continentWorkedStatus = []; // [continent] => count + + // Create a lookup array for valid bands + $validBands = array_flip($bands); + + // Get all WAC data in efficient queries + $wacData = $this->getWacData($location_list, $postdata); + + // Process regular band data + foreach ($wacData as $wac) { + // Skip if this band is not in our requested bands list + if (!isset($validBands[$wac->col_band])) { + continue; } - if ($postdata['worked'] != NULL) { - $wacBand = $this->getWACWorked($location_list, $band, $postdata); - foreach ($wacBand as $line) { - $bandWac[$line->col_cont][$band] = '
col_cont) . '","' . $band . '","All", "All","'. $postdata['mode'] . '","WAC","")\'>W
'; - $wac[$line->col_cont]['count']++; + // Track worked status for this continent + if (!isset($continentWorkedStatus[$wac->col_cont])) { + $continentWorkedStatus[$wac->col_cont] = 0; + } + $continentWorkedStatus[$wac->col_cont]++; + + // Check if confirmed based on the confirmation types selected in postdata + $isConfirmed = false; + $confirmationLetters = ''; + if (isset($postdata['qsl']) && $postdata['qsl'] == 1 && $wac->qsl > 0) { + $isConfirmed = true; + $confirmationLetters .= 'Q'; + } + if (isset($postdata['lotw']) && $postdata['lotw'] == 1 && $wac->lotw > 0) { + $isConfirmed = true; + $confirmationLetters .= 'L'; + } + if (isset($postdata['eqsl']) && $postdata['eqsl'] == 1 && $wac->eqsl > 0) { + $isConfirmed = true; + $confirmationLetters .= 'E'; + } + if (isset($postdata['qrz']) && $postdata['qrz'] == 1 && $wac->qrz > 0) { + $isConfirmed = true; + $confirmationLetters .= 'Z'; + } + if (isset($postdata['clublog']) && $postdata['clublog'] == 1 && $wac->clublog > 0) { + $isConfirmed = true; + $confirmationLetters .= 'C'; + } + + if ($isConfirmed) { + $wacMatrix[$wac->col_cont][$wac->col_band] = '
col_cont) . '","' . $wac->col_band . '","All", "All","'. $postdata['mode'] . '","WAC","'.$qsl.'","","")\'>'.$confirmationLetters.'
'; + // Track confirmed continents for summary + if (!isset($confirmedContinents[$wac->col_band][$wac->col_cont])) { + $confirmedContinents[$wac->col_band][$wac->col_cont] = true; + $summary['confirmed'][$wac->col_band]++; } + } else { + $wacMatrix[$wac->col_cont][$wac->col_band] = '
col_cont) . '","' . $wac->col_band . '","All", "All","'. $postdata['mode'] . '","WAC","","","")\'>W
'; } - if ($postdata['confirmed'] != NULL) { - $wacBand = $this->getWACConfirmed($location_list, $band, $postdata); - foreach ($wacBand as $line) { - $bandWac[$line->col_cont][$band] = '
col_cont) . '","' . $band . '","All", "All","'. $postdata['mode'] . '","WAC","'.$qsl.'")\'>C
'; - $wac[$line->col_cont]['count']++; - } + + // Track worked continents for summary + if (!isset($workedContinents[$wac->col_band][$wac->col_cont])) { + $workedContinents[$wac->col_band][$wac->col_cont] = true; + $summary['worked'][$wac->col_band]++; } } - // We want to remove the worked continents in the list, since we do not want to display them - if ($postdata['worked'] == NULL) { - $wacBand = $this->getWACWorked($location_list, $postdata['band'], $postdata); - foreach ($wacBand as $line) { - unset($bandWac[$line->col_cont]); - } - } + // Process SAT data if needed + if ($postdata['band'] == 'SAT') { + if (in_array('SAT', $bands)) { + $wacDataSat = $this->getWacDataSat($location_list, $postdata); - // We want to remove the confirmed continents in the list, since we do not want to display them - if ($postdata['confirmed'] == NULL) { - $wacBand = $this->getWACConfirmed($location_list, $postdata['band'], $postdata); - foreach ($wacBand as $line) { - unset($bandWac[$line->col_cont]); - } - } - - if ($postdata['notworked'] == NULL) { - foreach ($this->validContinents as $cont) { - if ($wac[$cont]['count'] == 0) { - if (isset($bandWac)) { - unset($bandWac[$cont]); + foreach ($wacDataSat as $wac) { + // Track worked status for this continent + if (!isset($continentWorkedStatus[$wac->col_cont])) { + $continentWorkedStatus[$wac->col_cont] = 0; } - }; + $continentWorkedStatus[$wac->col_cont]++; + + // Check if confirmed based on the confirmation types selected in postdata + $isConfirmed = false; + $confirmationLetters = ''; + if (isset($postdata['qsl']) && $postdata['qsl'] == 1 && $wac->qsl > 0) { + $isConfirmed = true; + $confirmationLetters .= 'Q'; + } + if (isset($postdata['lotw']) && $postdata['lotw'] == 1 && $wac->lotw > 0) { + $isConfirmed = true; + $confirmationLetters .= 'L'; + } + if (isset($postdata['eqsl']) && $postdata['eqsl'] == 1 && $wac->eqsl > 0) { + $isConfirmed = true; + $confirmationLetters .= 'E'; + } + if (isset($postdata['qrz']) && $postdata['qrz'] == 1 && $wac->qrz > 0) { + $isConfirmed = true; + $confirmationLetters .= 'Z'; + } + if (isset($postdata['clublog']) && $postdata['clublog'] == 1 && $wac->clublog > 0) { + $isConfirmed = true; + $confirmationLetters .= 'C'; + } + + if ($isConfirmed) { + $wacMatrix[$wac->col_cont]['SAT'] = '
col_cont) . '","SAT","All", "All","'. $postdata['mode'] . '","WAC","'.$qsl.'","","")\'>'.$confirmationLetters.'
'; + // Track confirmed continents for summary + if (!isset($confirmedContinents['SAT'][$wac->col_cont])) { + $confirmedContinents['SAT'][$wac->col_cont] = true; + $summary['confirmed']['SAT']++; + } + } else { + if ($postdata['worked'] != NULL) { + $wacMatrix[$wac->col_cont]['SAT'] = '
col_cont) . '","SAT","All", "All","'. $postdata['mode'] . '","WAC","","","")\'>W
'; + } + } + + // Track worked continents for summary + if (!isset($workedContinents['SAT'][$wac->col_cont])) { + $workedContinents['SAT'][$wac->col_cont] = true; + $summary['worked']['SAT']++; + } + } } } - if (isset($bandWac)) { - return $bandWac; + // Calculate totals across all bands (excluding SAT) + $totalWorkedContinents = []; + $totalConfirmedContinents = []; + foreach ($workedContinents as $band => $continents) { + foreach ($continents as $cont => $true) { + if (!isset($totalWorkedContinents[$cont])) { + $totalWorkedContinents[$cont] = true; + if ($band === 'SAT') { + continue; + } + $summary['worked']['Total']++; + } + } + } + foreach ($confirmedContinents as $band => $continents) { + foreach ($continents as $cont => $true) { + if (!isset($totalConfirmedContinents[$cont])) { + $totalConfirmedContinents[$cont] = true; + if ($band === 'SAT') { + continue; + } + $summary['confirmed']['Total']++; + } + } + } + + if (isset($wacMatrix)) { + // Return both the matrix data and summary + return ['matrix' => $wacMatrix, 'summary' => $summary]; } else { - return 0; + return ['matrix' => [], 'summary' => $summary]; } } - /* - * Function returns all worked, but not confirmed continents - * $postdata contains data from the form, in this case Lotw or QSL are used - */ - function getWACWorked($location_list, $band, $postdata) { - $bindings=[]; - $sql = "SELECT distinct col_cont FROM " . $this->config->item('table_name') . " thcv - LEFT JOIN satellite on thcv.COL_SAT_NAME = satellite.name - where station_id in (" . $location_list . ") and col_cont in ('AF', 'EU', 'AS', 'SA', 'NA', 'OC', 'AN')"; - - if ($postdata['mode'] != 'All') { - $sql .= " and (col_mode = ? or col_submode = ?)"; - $bindings[]=$postdata['mode']; - $bindings[]=$postdata['mode']; - } - - $sql .= $this->genfunctions->addBandToQuery($band,$bindings); - if ($band == 'SAT') { - if ($postdata['sat'] != 'All') { - $sql .= " and col_sat_name = ?"; - $bindings[]=$postdata['sat']; - } - } - $sql .= $this->addOrbitToQuery($postdata,$bindings); - - $sql .= " and not exists (select 1 from " . $this->config->item('table_name') . " thcv2 - LEFT JOIN satellite on thcv2.COL_SAT_NAME = satellite.name - where station_id in (" . $location_list . - ") and col_cont = thcv.col_cont and col_cont <> '' "; - - $sql .= $this->genfunctions->addBandToQuery($band,$bindings); - if ($band == 'SAT') { - if ($postdata['sat'] != 'All') { - $sql .= " and col_sat_name = ?"; - $bindings[]=$postdata['sat']; - } - } - - if ($postdata['mode'] != 'All') { - $sql .= " and (col_mode = ? or col_submode = ?)"; - $bindings[]=$postdata['mode']; - $bindings[]=$postdata['mode']; - } - - $sql .= $this->addOrbitToQuery($postdata,$bindings); - - $sql .= $this->genfunctions->addQslToQuery($postdata); - - $sql .= ")"; - - $query = $this->db->query($sql,$bindings); - - return $query->result(); - } - - /* - * Function returns all confirmed continents on given band and on LoTW or QSL - * $postdata contains data from the form, in this case Lotw or QSL are used - */ - function getWACConfirmed($location_list, $band, $postdata) { - $bindings=[]; - $sql = "SELECT distinct col_cont FROM " . $this->config->item('table_name') . " thcv - LEFT JOIN satellite on thcv.COL_SAT_NAME = satellite.name - where station_id in (" . $location_list . ") and col_cont in ('AF', 'EU', 'AS', 'SA', 'NA', 'OC', 'AN')"; - - if ($postdata['mode'] != 'All') { - $sql .= " and (col_mode = ? or col_submode = ?)"; - $bindings[]=$postdata['mode']; - $bindings[]=$postdata['mode']; - } - - $sql .= $this->genfunctions->addBandToQuery($band,$bindings); - if ($band == 'SAT') { - if ($postdata['sat'] != 'All') { - $sql .= " and col_sat_name = ?"; - $bindings[]=$postdata['sat']; - } - } - - $sql .= $this->genfunctions->addQslToQuery($postdata); - - $sql .= $this->addOrbitToQuery($postdata,$bindings); - - $query = $this->db->query($sql,$bindings); - - return $query->result(); - } - - /* * Function gets worked and confirmed summary on each band on the active stationprofile + * This is now integrated into get_wac_array for efficiency */ function get_wac_summary($bands, $postdata, $location_list) { - foreach ($bands as $band) { - $worked = $this->getSummaryByBand($band, $postdata, $location_list); - $confirmed = $this->getSummaryByBandConfirmed($band, $postdata, $location_list); - $wacSummary['worked'][$band] = $worked[0]->count; - $wacSummary['confirmed'][$band] = $confirmed[0]->count; - } - - $workedTotal = $this->getSummaryByBand($postdata['band'], $postdata, $location_list); - $confirmedTotal = $this->getSummaryByBandConfirmed($postdata['band'], $postdata, $location_list); - - $wacSummary['worked']['Total'] = $workedTotal[0]->count; - $wacSummary['confirmed']['Total'] = $confirmedTotal[0]->count; - - return $wacSummary; - } - - function getSummaryByBand($band, $postdata, $location_list) { - $bindings=[]; - $sql = "SELECT count(distinct thcv.col_cont) as count FROM " . $this->config->item('table_name') . " thcv"; - $sql .= " LEFT JOIN satellite on thcv.COL_SAT_NAME = satellite.name"; - - $sql .= " where station_id in (" . $location_list . ") and col_cont in ('AF', 'EU', 'AS', 'SA', 'NA', 'OC', 'AN')"; - - if ($band == 'SAT') { - $sql .= " and thcv.col_prop_mode = ?"; - $bindings[]=$band; - if ($band != 'All' && $postdata['sat'] != 'All') { - $sql .= " and col_sat_name = ?"; - $bindings[]=$postdata['sat']; - } - } else if ($band == 'All') { - $this->load->model('bands'); - - $bandslots = $this->bands->get_worked_bands(); - - $bandslots_list = "'".implode("','",$bandslots)."'"; - - $sql .= " and thcv.col_band in (" . $bandslots_list . ")" . - " and thcv.col_prop_mode !='SAT'"; - } else { - $sql .= " and thcv.col_prop_mode !='SAT'"; - $sql .= " and thcv.col_band = ?"; - $bindings[]=$band; - } - - if ($postdata['mode'] != 'All') { - $sql .= " and (col_mode = ? or col_submode = ?)"; - $bindings[]=$postdata['mode']; - $bindings[]=$postdata['mode']; - } - - $sql .= $this->addOrbitToQuery($postdata,$bindings); - - $query = $this->db->query($sql,$bindings); - return $query->result(); - } - - function getSummaryByBandConfirmed($band, $postdata, $location_list){ - $bindings=[]; - $sql = "SELECT count(distinct thcv.col_cont) as count FROM " . $this->config->item('table_name') . " thcv"; - $sql .= " LEFT JOIN satellite on thcv.COL_SAT_NAME = satellite.name"; - - $sql .= " where station_id in (" . $location_list . ") and col_cont in ('AF', 'EU', 'AS', 'SA', 'NA', 'OC', 'AN')"; - - if ($band == 'SAT') { - $sql .= " and thcv.col_prop_mode ='" . $band . "'"; - if ($postdata['sat'] != 'All') { - $sql .= " and col_sat_name = ?"; - $bindings[]=$postdata['sat']; - } - } else if ($band == 'All') { - $this->load->model('bands'); - - $bandslots = $this->bands->get_worked_bands(); - - $bandslots_list = "'".implode("','",$bandslots)."'"; - - $sql .= " and thcv.col_band in (" . $bandslots_list . ")" . - " and thcv.col_prop_mode !='SAT'"; - } else { - $sql .= " and thcv.col_prop_mode !='SAT'"; - $sql .= " and thcv.col_band = ?"; - $bindings[]=$band; - } - - if ($postdata['mode'] != 'All') { - $sql .= " and (col_mode = ? or col_submode = ?)"; - $bindings[]=$postdata['mode']; - $bindings[]=$postdata['mode']; - } - - $sql .= $this->genfunctions->addQslToQuery($postdata); - $sql .= $this->addOrbitToQuery($postdata,$bindings); - - $query = $this->db->query($sql,$bindings); - - return $query->result(); + $result = $this->get_wac_array($bands, $postdata, $location_list); + return $result['summary']; } // Adds orbit type to query diff --git a/application/views/awards/wac/index.php b/application/views/awards/wac/index.php index a3ea41d86..b567ea337 100644 --- a/application/views/awards/wac/index.php +++ b/application/views/awards/wac/index.php @@ -2,69 +2,53 @@
-
- -

- -
- +
+ +

+ +
+
-
-
-
-
- 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('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('band') != 'SAT' && $this->input->post('band') != 'All') echo "style=\"display: none\""; ?>> +
input->post('band') != 'SAT' && $this->input->post('band') != 'All') echo "style=\"display: none\""; ?>>
- -
+
+
@@ -132,8 +116,7 @@
- - +
@@ -144,6 +127,13 @@ '.__("(Q)SL-Paper-Card").", "; + echo __("(L)oTW").", "; + echo __("(e)QSL").", "; + echo __('QR(Z)-"confirmation"').", "; + echo __("(C)lublog").", "; + echo __("(W)orked").''; echo " @@ -151,17 +141,20 @@ "; foreach($bands as $band) { - echo ''; + if (($posted_band != 'SAT') && ($band == 'SAT')) { + continue; + } + echo ''; } echo ''; - foreach ($wac_array as $wac => $value) { // Fills the table with the data + foreach ($wac_array['matrix'] as $wac => $value) { // Fills the table with the data echo ''; foreach ($value as $key) { - echo ''; + echo ''; } echo ''; } @@ -173,22 +166,56 @@ "; foreach($bands as $band) { + if (($posted_band != 'SAT') && ($band == 'SAT')) { + continue; + } echo ''; - } - echo " + } + if ($posted_band != 'SAT') { + echo ""; + } ?> + + - "; + "; - foreach ($wac_summary['worked'] as $wac) { // Fills the table with the data - echo ''; + foreach ($wac_summary['worked'] as $wac => $value) { // Fills the table with the data + if (($posted_band != 'SAT') && ($wac == 'SAT')) { + continue; + } + + if (($posted_band == 'SAT') && ($wac == 'Total')) { + continue; + } + echo ''; } echo ""; - foreach ($wac_summary['confirmed'] as $wac) { // Fills the table with the data - echo ''; + foreach ($wac_summary['confirmed'] as $wac => $value) { // Fills the table with the data + if (($posted_band != 'SAT') && ($wac == 'SAT')) { + continue; + } + + if (($posted_band == 'SAT') && ($wac == 'Total')) { + continue; + } + echo ''; } echo ' @@ -197,7 +224,7 @@ } else { - echo ''; + echo ''; } ?> diff --git a/assets/js/sections/wac.js b/assets/js/sections/wac.js new file mode 100644 index 000000000..e0f5071c1 --- /dev/null +++ b/assets/js/sections/wac.js @@ -0,0 +1,21 @@ +$('#band2').change(function(){ + var band = $("#band2 option:selected").text(); + if (band != "SAT") { + $("#sats").val('All'); + $("#orbits").val('All'); + $("#satrow").hide(); + $("#orbitrow").hide(); + } else { + $("#satrow").show(); + $("#orbitrow").show(); + } +}); + +$('#band2').change(); // trigger the change on fresh-load to hide/show SAT-Params + +$('#sats').change(function(){ + var sat = $("#sats option:selected").text(); + $("#band2").val('SAT'); + if (sat != "All") { + } +}); From a00d6bb2f562b5c73148f0c4a39a04c194adfb76 Mon Sep 17 00:00:00 2001 From: github-actions Date: Wed, 11 Mar 2026 14:23:27 +0000 Subject: [PATCH 2/2] po/mo updates --- .../locale/bg_BG/LC_MESSAGES/messages.po | 175 ++++++++--------- application/locale/bs/LC_MESSAGES/messages.po | 175 ++++++++--------- .../locale/cnr/LC_MESSAGES/messages.po | 175 ++++++++--------- .../locale/cs_CZ/LC_MESSAGES/messages.po | 177 +++++++++--------- .../locale/de_DE/LC_MESSAGES/messages.po | 177 +++++++++--------- .../locale/el_GR/LC_MESSAGES/messages.po | 175 ++++++++--------- .../locale/es_ES/LC_MESSAGES/messages.po | 177 +++++++++--------- application/locale/et/LC_MESSAGES/messages.po | 177 +++++++++--------- .../locale/fi_FI/LC_MESSAGES/messages.po | 177 +++++++++--------- .../locale/fr_FR/LC_MESSAGES/messages.po | 177 +++++++++--------- application/locale/hr/LC_MESSAGES/messages.po | 177 +++++++++--------- application/locale/hu/LC_MESSAGES/messages.po | 177 +++++++++--------- application/locale/hy/LC_MESSAGES/messages.po | 175 ++++++++--------- .../locale/it_IT/LC_MESSAGES/messages.po | 177 +++++++++--------- application/locale/ja/LC_MESSAGES/messages.po | 177 +++++++++--------- application/locale/lt/LC_MESSAGES/messages.po | 175 ++++++++--------- application/locale/lv/LC_MESSAGES/messages.po | 175 ++++++++--------- .../locale/nl_NL/LC_MESSAGES/messages.po | 177 +++++++++--------- .../locale/pl_PL/LC_MESSAGES/messages.po | 177 +++++++++--------- .../locale/pt_PT/LC_MESSAGES/messages.po | 177 +++++++++--------- .../locale/ru_RU/LC_MESSAGES/messages.po | 177 +++++++++--------- application/locale/sk/LC_MESSAGES/messages.po | 177 +++++++++--------- application/locale/sl/LC_MESSAGES/messages.po | 175 ++++++++--------- application/locale/sq/LC_MESSAGES/messages.po | 175 ++++++++--------- application/locale/sr/LC_MESSAGES/messages.po | 177 +++++++++--------- .../locale/sv_SE/LC_MESSAGES/messages.po | 177 +++++++++--------- .../locale/tr_TR/LC_MESSAGES/messages.po | 177 +++++++++--------- .../locale/zh_CN/LC_MESSAGES/messages.po | 177 +++++++++--------- assets/lang_src/messages.pot | 175 ++++++++--------- 29 files changed, 2629 insertions(+), 2484 deletions(-) diff --git a/application/locale/bg_BG/LC_MESSAGES/messages.po b/application/locale/bg_BG/LC_MESSAGES/messages.po index b79185258..88ac8dcc0 100644 --- a/application/locale/bg_BG/LC_MESSAGES/messages.po +++ b/application/locale/bg_BG/LC_MESSAGES/messages.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Report-Msgid-Bugs-To: translations@wavelog.org\n" -"POT-Creation-Date: 2026-03-11 11:45+0000\n" +"POT-Creation-Date: 2026-03-11 14:23+0000\n" "PO-Revision-Date: 2024-11-01 08:53+0000\n" "Last-Translator: Plamen Panteleev \n" "Language-Team: Bulgarian \n" "Language-Team: Bosnian \n" "Language-Team: Montenegrin \n" "Language-Team: Czech \n" "Language-Team: German \n" "Language-Team: Greek \n" "Language-Team: Spanish \n" "Language-Team: Estonian \n" "Language-Team: Finnish \n" "Language-Team: French \n" "Language-Team: Croatian \n" "Language-Team: Hungarian \n" "Language-Team: Armenian \n" "Language-Team: Italian \n" "Language-Team: Japanese \n" "Language-Team: Lithuanian \n" "Language-Team: Latvian \n" "Language-Team: Dutch \n" "Language-Team: Polish \n" "Language-Team: Portuguese (Portugal) \n" "Language-Team: Russian \n" "Language-Team: Slovak \n" "Language-Team: Albanian \n" "Language-Team: Serbian \n" "Language-Team: Swedish \n" "Language-Team: Turkish \n" "Language-Team: Chinese (Simplified Han script) \n" "Language-Team: LANGUAGE \n" @@ -139,8 +139,8 @@ msgid "Activated Gridsquare Map" msgstr "" #: application/controllers/Activated_gridmap.php:31 -#: application/controllers/Awards.php:1067 -#: application/controllers/Awards.php:1103 +#: application/controllers/Awards.php:1066 +#: application/controllers/Awards.php:1102 #: application/controllers/Gridmap.php:32 #: application/controllers/Visitor.php:385 #: application/views/activators/index.php:100 @@ -306,25 +306,25 @@ msgstr "" #: application/controllers/Awards.php:205 #: application/controllers/Awards.php:443 #: application/controllers/Awards.php:493 -#: application/controllers/Awards.php:611 -#: application/controllers/Awards.php:629 -#: application/controllers/Awards.php:647 -#: application/controllers/Awards.php:729 -#: application/controllers/Awards.php:791 -#: application/controllers/Awards.php:853 -#: application/controllers/Awards.php:915 -#: application/controllers/Awards.php:1000 -#: application/controllers/Awards.php:1012 -#: application/controllers/Awards.php:1088 -#: application/controllers/Awards.php:1294 -#: application/controllers/Awards.php:1445 -#: application/controllers/Awards.php:1981 -#: application/controllers/Awards.php:2130 -#: application/controllers/Awards.php:2249 -#: application/controllers/Awards.php:2323 -#: application/controllers/Awards.php:2336 -#: application/controllers/Awards.php:2411 -#: application/controllers/Awards.php:2553 +#: application/controllers/Awards.php:610 +#: application/controllers/Awards.php:628 +#: application/controllers/Awards.php:646 +#: application/controllers/Awards.php:728 +#: application/controllers/Awards.php:790 +#: application/controllers/Awards.php:852 +#: application/controllers/Awards.php:914 +#: application/controllers/Awards.php:999 +#: application/controllers/Awards.php:1011 +#: application/controllers/Awards.php:1087 +#: application/controllers/Awards.php:1293 +#: application/controllers/Awards.php:1444 +#: application/controllers/Awards.php:1980 +#: application/controllers/Awards.php:2129 +#: application/controllers/Awards.php:2259 +#: application/controllers/Awards.php:2333 +#: application/controllers/Awards.php:2346 +#: application/controllers/Awards.php:2421 +#: application/controllers/Awards.php:2563 #, php-format msgid "Awards - %s" msgstr "" @@ -391,11 +391,11 @@ msgstr "" msgid "VUCC" msgstr "" -#: application/controllers/Awards.php:525 +#: application/controllers/Awards.php:524 msgid "Log View - VUCC" msgstr "" -#: application/controllers/Awards.php:575 +#: application/controllers/Awards.php:574 #: application/controllers/Callstats.php:100 #: application/controllers/Distancerecords.php:87 #: application/controllers/Statistics.php:372 @@ -408,50 +408,51 @@ msgstr "" msgid "Log View" msgstr "" -#: application/controllers/Awards.php:576 +#: application/controllers/Awards.php:575 msgid "and" msgstr "" -#: application/controllers/Awards.php:577 +#: application/controllers/Awards.php:576 #: application/views/awards/cq/index.php:135 #: application/views/awards/dxcc/index.php:32 #: application/views/awards/dxcc/index.php:176 #: application/views/awards/iota/index.php:123 #: application/views/awards/itu/index.php:137 +#: application/views/awards/wac/index.php:51 #: application/views/awards/wae/index.php:119 #: application/views/awards/wpx/index.php:81 msgid "Every band (w/o SAT)" msgstr "" -#: application/controllers/Awards.php:577 +#: application/controllers/Awards.php:576 msgid "band" msgstr "" -#: application/controllers/Awards.php:580 +#: application/controllers/Awards.php:579 msgid " and satellite " msgstr "" -#: application/controllers/Awards.php:583 +#: application/controllers/Awards.php:582 #: application/controllers/Callstats.php:107 msgid " and orbit type " msgstr "" -#: application/controllers/Awards.php:587 +#: application/controllers/Awards.php:586 #: application/controllers/Callstats.php:111 msgid " and propagation " msgstr "" -#: application/controllers/Awards.php:590 +#: application/controllers/Awards.php:589 #: application/controllers/Callstats.php:114 msgid " and mode " msgstr "" -#: application/controllers/Awards.php:593 +#: application/controllers/Awards.php:592 #: application/controllers/Callstats.php:117 msgid " and " msgstr "" -#: application/controllers/Awards.php:611 +#: application/controllers/Awards.php:610 #: application/controllers/Logbook.php:1463 #: application/views/awards/index.php:8 application/views/bandmap/list.php:327 #: application/views/bands/index.php:57 application/views/dashboard/index.php:9 @@ -479,7 +480,7 @@ msgstr "" msgid "SOTA" msgstr "" -#: application/controllers/Awards.php:629 +#: application/controllers/Awards.php:628 #: application/controllers/Logbook.php:1464 #: application/views/bandmap/list.php:329 application/views/bands/index.php:64 #: application/views/dashboard/index.php:10 @@ -501,7 +502,7 @@ msgstr "" msgid "WWFF" msgstr "" -#: application/controllers/Awards.php:647 +#: application/controllers/Awards.php:646 #: application/controllers/Logbook.php:1465 #: application/views/adif/import.php:60 application/views/bandmap/list.php:328 #: application/views/bands/index.php:54 @@ -524,68 +525,68 @@ msgstr "" msgid "POTA" msgstr "" -#: application/controllers/Awards.php:729 +#: application/controllers/Awards.php:728 msgid "CQ WAZ (Worked All Zones)" msgstr "" -#: application/controllers/Awards.php:791 +#: application/controllers/Awards.php:790 #: application/views/accumulate/index.php:54 #: application/views/timeline/index.php:45 msgid "Worked All States (WAS)" msgstr "" -#: application/controllers/Awards.php:853 application/views/bands/index.php:55 +#: application/controllers/Awards.php:852 application/views/bands/index.php:55 #: application/views/interface_assets/header.php:228 msgid "RAC" msgstr "" -#: application/controllers/Awards.php:915 application/views/bands/index.php:51 +#: application/controllers/Awards.php:914 application/views/bands/index.php:51 msgid "H26" msgstr "" -#: application/controllers/Awards.php:1000 +#: application/controllers/Awards.php:999 msgid "IOTA (Island On The Air)" msgstr "" -#: application/controllers/Awards.php:1012 -#: application/controllers/Awards.php:1027 +#: application/controllers/Awards.php:1011 +#: application/controllers/Awards.php:1026 #: application/views/interface_assets/header.php:288 msgid "US Counties" msgstr "" -#: application/controllers/Awards.php:1042 +#: application/controllers/Awards.php:1041 msgid "Log View - Counties" msgstr "" -#: application/controllers/Awards.php:1049 +#: application/controllers/Awards.php:1048 msgid "Awards - " msgstr "" +#: application/controllers/Awards.php:1067 +#: application/controllers/Awards.php:1103 +msgid "Gridsquares worked" +msgstr "" + #: application/controllers/Awards.php:1068 #: application/controllers/Awards.php:1104 -msgid "Gridsquares worked" +msgid "Gridsquares confirmed on LoTW" msgstr "" #: application/controllers/Awards.php:1069 #: application/controllers/Awards.php:1105 -msgid "Gridsquares confirmed on LoTW" +msgid "Gridsquares confirmed by paper QSL" msgstr "" #: application/controllers/Awards.php:1070 #: application/controllers/Awards.php:1106 -msgid "Gridsquares confirmed by paper QSL" -msgstr "" - -#: application/controllers/Awards.php:1071 -#: application/controllers/Awards.php:1107 msgid "Total Gridsquares worked" msgstr "" -#: application/controllers/Awards.php:1088 +#: application/controllers/Awards.php:1087 msgid "Fred Fish Memorial Award (FFMA)" msgstr "" -#: application/controllers/Awards.php:1294 +#: application/controllers/Awards.php:1293 #: application/views/interface_assets/header.php:196 #: application/views/logbookadvanced/useroptions.php:250 #: application/views/qso/edit_ajax.php:393 application/views/qso/index.php:345 @@ -595,40 +596,40 @@ msgstr "" msgid "SIG" msgstr "" -#: application/controllers/Awards.php:1313 +#: application/controllers/Awards.php:1312 msgid "Awards - SIG - " msgstr "" -#: application/controllers/Awards.php:1445 application/views/bands/index.php:60 +#: application/controllers/Awards.php:1444 application/views/bands/index.php:60 msgid "WAP" msgstr "" -#: application/controllers/Awards.php:2130 +#: application/controllers/Awards.php:2129 #: application/views/awards/itu/index.php:34 msgid "ITU Zones" msgstr "" -#: application/controllers/Awards.php:2249 +#: application/controllers/Awards.php:2259 #: application/views/awards/wac/index.php:8 #: application/views/interface_assets/header.php:202 msgid "Worked All Continents (WAC)" msgstr "" -#: application/controllers/Awards.php:2323 +#: application/controllers/Awards.php:2333 msgid "WAE" msgstr "" -#: application/controllers/Awards.php:2336 +#: application/controllers/Awards.php:2346 #: application/views/interface_assets/header.php:212 msgid "73 on 73" msgstr "" -#: application/controllers/Awards.php:2411 +#: application/controllers/Awards.php:2421 #: application/views/awards/wpx/wpx_details.php:19 msgid "WPX" msgstr "" -#: application/controllers/Awards.php:2553 +#: application/controllers/Awards.php:2563 #: application/views/awards/pl_polska/index.php:37 #: application/views/interface_assets/header.php:270 msgid "\"Polska\" Award" @@ -799,6 +800,7 @@ msgstr "" #: application/views/awards/jcc/index.php:70 #: application/views/awards/pl_polska/index.php:84 #: application/views/awards/wab/index.php:106 +#: application/views/awards/wac/index.php:42 #: application/views/awards/wae/index.php:110 #: application/views/awards/waja/index.php:75 #: application/views/awards/wapc/index.php:75 @@ -1386,7 +1388,7 @@ msgstr "" #: application/views/awards/rac/index.php:54 #: application/views/awards/vucc/band.php:16 #: application/views/awards/wab/index.php:82 -#: application/views/awards/wac/index.php:49 +#: application/views/awards/wac/index.php:30 #: application/views/awards/wae/index.php:98 #: application/views/awards/waja/index.php:63 #: application/views/awards/wap/index.php:61 @@ -1427,7 +1429,7 @@ msgstr "" #: application/views/awards/pl_polska/index.php:76 #: application/views/awards/rac/index.php:58 #: application/views/awards/wab/index.php:90 -#: application/views/awards/wac/index.php:53 +#: application/views/awards/wac/index.php:34 #: application/views/awards/wae/index.php:102 #: application/views/awards/waja/index.php:67 #: application/views/awards/wap/index.php:65 @@ -1473,7 +1475,7 @@ msgstr "" #: application/views/awards/rac/index.php:82 #: application/views/awards/sig/qso_list.php:12 #: application/views/awards/wab/index.php:55 -#: application/views/awards/wac/index.php:111 +#: application/views/awards/wac/index.php:95 #: application/views/awards/wae/index.php:162 #: application/views/awards/waja/index.php:95 #: application/views/awards/wap/index.php:89 @@ -1797,7 +1799,7 @@ msgstr "" #: application/views/awards/sota/index.php:34 #: application/views/awards/vucc/index.php:22 #: application/views/awards/wab/index.php:24 -#: application/views/awards/wac/index.php:64 +#: application/views/awards/wac/index.php:48 #: application/views/awards/wae/index.php:116 #: application/views/awards/waja/index.php:81 #: application/views/awards/wap/index.php:75 @@ -3775,9 +3777,9 @@ msgstr "" #: application/views/awards/wab/index.php:38 #: application/views/awards/wab/index.php:48 #: application/views/awards/wab/index.php:57 +#: application/views/awards/wac/index.php:66 #: application/views/awards/wac/index.php:82 #: application/views/awards/wac/index.php:98 -#: application/views/awards/wac/index.php:114 #: application/views/awards/wae/index.php:133 #: application/views/awards/wae/index.php:149 #: application/views/awards/wae/index.php:165 @@ -4203,7 +4205,7 @@ msgstr "" #: application/views/awards/jcc/index.php:115 #: application/views/awards/pl_polska/index.php:93 #: application/views/awards/rac/index.php:107 -#: application/views/awards/wac/index.php:136 +#: application/views/awards/wac/index.php:119 #: application/views/awards/wae/index.php:33 #: application/views/awards/waja/index.php:120 #: application/views/awards/wap/index.php:114 @@ -4232,7 +4234,7 @@ msgstr "" #: application/views/activated_gridmap/index.php:24 #: application/views/awards/dxcc/index.php:187 #: application/views/awards/wab/index.php:36 -#: application/views/awards/wac/index.php:79 +#: application/views/awards/wac/index.php:63 #: application/views/awards/wae/index.php:130 #: application/views/awards/wpx/index.php:91 #: application/views/callstats/index.php:21 @@ -4265,7 +4267,7 @@ msgstr "" #: application/views/activated_gridmap/index.php:34 #: application/views/awards/dxcc/index.php:203 #: application/views/awards/wab/index.php:46 -#: application/views/awards/wac/index.php:95 +#: application/views/awards/wac/index.php:79 #: application/views/awards/wae/index.php:146 #: application/views/awards/wpx/index.php:105 #: application/views/callstats/index.php:35 @@ -4299,7 +4301,7 @@ msgstr "" #: application/views/awards/pl_polska/index.php:80 #: application/views/awards/rac/index.php:62 #: application/views/awards/wab/index.php:98 -#: application/views/awards/wac/index.php:57 +#: application/views/awards/wac/index.php:38 #: application/views/awards/wae/index.php:106 #: application/views/awards/waja/index.php:71 #: application/views/awards/wap/index.php:69 @@ -4365,7 +4367,6 @@ msgstr "" #: application/views/awards/sota/index.php:60 #: application/views/awards/vucc/band.php:41 #: application/views/awards/vucc/index.php:40 -#: application/views/awards/wac/index.php:200 #: application/views/awards/wae/index.php:296 #: application/views/awards/waja/index.php:206 #: application/views/awards/wap/index.php:202 @@ -5363,7 +5364,6 @@ msgstr "" #: application/views/awards/iota/index.php:237 #: application/views/awards/jcc/index.php:187 #: application/views/awards/rac/index.php:174 -#: application/views/awards/wac/index.php:178 #: application/views/awards/waja/index.php:183 #: application/views/awards/wap/index.php:181 #: application/views/awards/wapc/index.php:183 @@ -5592,7 +5592,6 @@ msgstr "" #: application/views/awards/cq/index.php:88 #: application/views/awards/itu/index.php:90 #: application/views/awards/wab/list.php:6 -#: application/views/awards/wac/index.php:23 #: application/views/awards/wpx/wpx_details.php:24 #: application/views/bandmap/list.php:88 application/views/bandmap/list.php:299 #: application/views/dashboard/index.php:342 @@ -5605,7 +5604,6 @@ msgstr "" #: application/views/awards/cq/index.php:88 #: application/views/awards/itu/index.php:90 -#: application/views/awards/wac/index.php:23 #: application/views/bandmap/list.php:87 application/views/bandmap/list.php:298 #: application/views/dashboard/index.php:338 #: application/views/dashboard/index.php:454 @@ -5622,7 +5620,6 @@ msgstr "" #: application/views/awards/itu/index.php:94 #: application/views/awards/jcc/index.php:36 #: application/views/awards/rac/index.php:32 -#: application/views/awards/wac/index.php:27 #: application/views/awards/wae/index.php:76 #: application/views/awards/waja/index.php:41 #: application/views/awards/wap/index.php:39 @@ -5639,7 +5636,6 @@ msgstr "" #: application/views/awards/itu/index.php:98 #: application/views/awards/jcc/index.php:40 #: application/views/awards/rac/index.php:36 -#: application/views/awards/wac/index.php:31 #: application/views/awards/wae/index.php:80 #: application/views/awards/waja/index.php:45 #: application/views/awards/wap/index.php:43 @@ -5655,7 +5651,6 @@ msgstr "" #: application/views/awards/itu/index.php:102 #: application/views/awards/jcc/index.php:44 #: application/views/awards/rac/index.php:40 -#: application/views/awards/wac/index.php:35 #: application/views/awards/wae/index.php:84 #: application/views/awards/waja/index.php:49 #: application/views/awards/wap/index.php:47 @@ -5672,7 +5667,7 @@ msgstr "" #: application/views/awards/itu/index.php:108 #: application/views/awards/jcc/index.php:50 #: application/views/awards/rac/index.php:46 -#: application/views/awards/wac/index.php:41 +#: application/views/awards/wac/index.php:22 #: application/views/awards/wae/index.php:90 #: application/views/awards/waja/index.php:55 #: application/views/awards/wap/index.php:53 @@ -5685,7 +5680,7 @@ msgstr "" #: application/views/awards/cq/index.php:110 #: application/views/awards/iota/index.php:64 #: application/views/awards/itu/index.php:112 -#: application/views/awards/wac/index.php:45 +#: application/views/awards/wac/index.php:26 #: application/views/interface_assets/footer.php:2379 #: application/views/logbookadvanced/index.php:54 #: application/views/qso/edit_ajax.php:420 @@ -5729,6 +5724,7 @@ msgstr "" #: application/views/awards/cq/index.php:192 #: application/views/awards/dxcc/index.php:264 #: application/views/awards/itu/index.php:194 +#: application/views/awards/wac/index.php:130 #: application/views/awards/wae/index.php:189 msgid "Legend:" msgstr "" @@ -5736,6 +5732,7 @@ msgstr "" #: application/views/awards/cq/index.php:193 #: application/views/awards/dxcc/index.php:265 #: application/views/awards/itu/index.php:195 +#: application/views/awards/wac/index.php:131 #: application/views/awards/wae/index.php:190 msgid "(Q)SL-Paper-Card" msgstr "" @@ -5743,6 +5740,7 @@ msgstr "" #: application/views/awards/cq/index.php:194 #: application/views/awards/dxcc/index.php:266 #: application/views/awards/itu/index.php:196 +#: application/views/awards/wac/index.php:132 #: application/views/awards/wae/index.php:191 msgid "(L)oTW" msgstr "" @@ -5750,6 +5748,7 @@ msgstr "" #: application/views/awards/cq/index.php:195 #: application/views/awards/dxcc/index.php:267 #: application/views/awards/itu/index.php:197 +#: application/views/awards/wac/index.php:133 #: application/views/awards/wae/index.php:192 msgid "(e)QSL" msgstr "" @@ -5757,6 +5756,7 @@ msgstr "" #: application/views/awards/cq/index.php:196 #: application/views/awards/dxcc/index.php:268 #: application/views/awards/itu/index.php:198 +#: application/views/awards/wac/index.php:134 #: application/views/awards/wae/index.php:193 msgid "QR(Z)-\"confirmation\"" msgstr "" @@ -5764,6 +5764,7 @@ msgstr "" #: application/views/awards/cq/index.php:197 #: application/views/awards/dxcc/index.php:269 #: application/views/awards/itu/index.php:199 +#: application/views/awards/wac/index.php:135 #: application/views/awards/wae/index.php:194 msgid "(C)lublog" msgstr "" @@ -5771,6 +5772,7 @@ msgstr "" #: application/views/awards/cq/index.php:198 #: application/views/awards/dxcc/index.php:270 #: application/views/awards/itu/index.php:200 +#: application/views/awards/wac/index.php:136 #: application/views/awards/wae/index.php:195 msgid "(W)orked" msgstr "" @@ -5783,7 +5785,7 @@ msgstr "" #: application/views/awards/itu/index.php:226 #: application/views/awards/jcc/index.php:170 #: application/views/awards/rac/index.php:165 -#: application/views/awards/wac/index.php:169 +#: application/views/awards/wac/index.php:162 #: application/views/awards/wae/index.php:227 #: application/views/awards/waja/index.php:174 #: application/views/awards/wap/index.php:172 @@ -5796,6 +5798,7 @@ msgstr "" #: application/views/awards/cq/index.php:237 #: application/views/awards/dxcc/index.php:315 #: application/views/awards/itu/index.php:239 +#: application/views/awards/wac/index.php:175 #: application/views/awards/wae/index.php:240 msgid "Total (ex SAT)" msgstr "" @@ -5808,7 +5811,7 @@ msgstr "" #: application/views/awards/itu/index.php:244 #: application/views/awards/jcc/index.php:197 #: application/views/awards/rac/index.php:178 -#: application/views/awards/wac/index.php:182 +#: application/views/awards/wac/index.php:183 #: application/views/awards/wae/index.php:247 #: application/views/awards/waja/index.php:188 #: application/views/awards/wap/index.php:185 @@ -5826,7 +5829,7 @@ msgstr "" #: application/views/awards/itu/index.php:257 #: application/views/awards/jcc/index.php:216 #: application/views/awards/rac/index.php:185 -#: application/views/awards/wac/index.php:189 +#: application/views/awards/wac/index.php:203 #: application/views/awards/wae/index.php:269 #: application/views/awards/waja/index.php:195 #: application/views/awards/wap/index.php:192 @@ -5900,7 +5903,6 @@ msgstr "" #: application/views/awards/helvetia/index.php:80 #: application/views/awards/jcc/index.php:79 #: application/views/awards/rac/index.php:71 -#: application/views/awards/wac/index.php:67 #: application/views/awards/waja/index.php:84 #: application/views/awards/wap/index.php:78 #: application/views/awards/wapc/index.php:84 @@ -5914,7 +5916,6 @@ msgstr "" #: application/views/awards/jcc/index.php:114 #: application/views/awards/pl_polska/index.php:92 #: application/views/awards/rac/index.php:106 -#: application/views/awards/wac/index.php:135 #: application/views/awards/waja/index.php:119 #: application/views/awards/wap/index.php:113 #: application/views/awards/wapc/index.php:119 @@ -6856,7 +6857,7 @@ msgstr "" msgid "Awards - Worked All Continents (WAC)" msgstr "" -#: application/views/awards/wac/index.php:152 +#: application/views/awards/wac/index.php:142 #: application/views/bandmap/list.php:101 #: application/views/bandmap/list.php:556 #: application/views/bandmap/list.php:594 @@ -6871,6 +6872,10 @@ msgstr "" msgid "Continent" msgstr "" +#: application/views/awards/wac/index.php:227 +msgid "No QSOS found matching the criteria for this award!" +msgstr "" + #: application/views/awards/wae/index.php:18 msgid "WAE Award" msgstr ""
# " . __("Continent") . "' . $band . '' . $band . '
' . $i++ . ' '. $wac.'' . $key . '' . $key . '
' . $band . '" . __("Total") . "
" . __("Total (ex SAT)") . "
" . __("Total worked") . "" . __("Total worked") . "' . $wac . ''; + if ($wac == 'Total' && $posted_band != 'SAT') { + echo ''.$value.''; + } else { + echo $value; + } + echo '
" . __("Total confirmed") . "' . $wac . ''; + if ($wac == 'Total' && $posted_band != 'SAT') { + echo ''.$value.''; + } else { + echo $value; + } + echo '