diff --git a/application/controllers/Statistics.php b/application/controllers/Statistics.php index 67098d2ed..cc7814065 100644 --- a/application/controllers/Statistics.php +++ b/application/controllers/Statistics.php @@ -20,21 +20,21 @@ class Statistics extends CI_Controller { } else { redirect('user/login'); } - } + } // Render User Interface // Set Page Title $data['page_title'] = __("Statistics"); $data['sat_active'] = array_search("SAT", $this->bands->get_user_bands(), true); - + // Load Views $this->load->view('interface_assets/header', $data); $this->load->view('statistics/index'); $this->load->view('interface_assets/footer'); } - + function custom() { - + $this->load->model('user_model'); if(!$this->user_model->authorize($this->config->item('auth_mode'))) { if($this->user_model->validate_session()) { @@ -44,12 +44,12 @@ class Statistics extends CI_Controller { redirect('user/login'); } } - + $this->load->model('logbook_model'); $data['page_title'] = __("Custom Statistics"); $data['modes'] = $this->logbook_model->get_modes(); - + $this->load->helper(array('form', 'url')); $this->load->library('form_validation'); @@ -65,16 +65,16 @@ class Statistics extends CI_Controller { } else { - + $this->load->model('stats'); - + $data['result'] = $this->stats->result(); - + $this->load->view('interface_assets/header', $data); $this->load->view('statistics/custom_result'); $this->load->view('interface_assets/footer'); } - + } public function get_year() { @@ -84,7 +84,7 @@ class Statistics extends CI_Controller { $totals_year = $this->logbook_model->totals_year(); $yearstats = array(); - + $i = 0; if ($totals_year) { foreach($totals_year->result() as $qso_numbers) { @@ -92,7 +92,7 @@ class Statistics extends CI_Controller { $yearstats[$i++]['total'] = $qso_numbers->total; } } - + header('Content-Type: application/json'); echo json_encode($yearstats); } @@ -101,7 +101,7 @@ class Statistics extends CI_Controller { $this->load->model('logbook_model'); $modestats = array(); - + $i = 0; $modestats[$i]['mode'] = 'ssb'; $modestats[$i++]['total'] = $this->logbook_model->total_ssb(); @@ -112,7 +112,7 @@ class Statistics extends CI_Controller { $modestats[$i]['mode'] = 'digi'; $modestats[$i]['total'] = $this->logbook_model->total_digi(); usort($modestats, fn($a, $b) => $b['total'] <=> $a['total']); - + header('Content-Type: application/json'); echo json_encode($modestats); @@ -124,9 +124,9 @@ class Statistics extends CI_Controller { $bandstats = array(); $total_bands = $this->logbook_model->total_bands(); - + $i = 0; - + if ($total_bands) { foreach($total_bands->result() as $qso_numbers) { $bandstats[$i]['band'] = $qso_numbers->band; @@ -145,7 +145,7 @@ class Statistics extends CI_Controller { $total_sat = $this->logbook_model->total_sat(); $i = 0; - + if ($total_sat) { foreach($total_sat->result() as $qso_numbers) { $satstats[$i]['sat'] = $qso_numbers->COL_SAT_NAME; @@ -160,6 +160,8 @@ class Statistics extends CI_Controller { public function get_unique_sat_callsigns() { $this->load->model('stats'); + $total_qsos = array(); + $result = $this->stats->unique_sat_callsigns(); $total_qsos['qsoarray'] = $result['qsoView']; $total_qsos['satunique'] = $result['satunique']; @@ -174,6 +176,8 @@ class Statistics extends CI_Controller { public function get_unique_callsigns() { $this->load->model('stats'); + $total_qsos = array(); + $result = $this->stats->unique_callsigns(); $total_qsos['qsoarray'] = $result['qsoView']; $total_qsos['bandunique'] = $result['bandunique']; @@ -187,7 +191,7 @@ class Statistics extends CI_Controller { public function get_total_sat_qsos() { $this->load->model('stats'); - $totalqsos = array(); + $total_qsos = array(); $result = $this->stats->total_sat_qsos(); $total_qsos['qsoarray'] = $result['qsoView']; @@ -202,7 +206,7 @@ class Statistics extends CI_Controller { public function get_total_qsos() { $this->load->model('stats'); - $totalqsos = array(); + $total_qsos = array(); $result = $this->stats->total_qsos(); $total_qsos['qsoarray'] = $result['qsoView']; @@ -212,4 +216,24 @@ class Statistics extends CI_Controller { $this->load->view('statistics/qsotable', $total_qsos); } + + public function qslstats() { + $this->load->model('stats'); + + $total_qsos = array(); + + $result = $this->stats->total_qsls(); + $total_qsos['qsoarray'] = $result['qsoView']; + $total_qsos['qsosatarray'] = $result['qsoSatView']; + $total_qsos['bands'] = $this->stats->get_bands(); + $total_qsos['sats'] = $this->stats->get_sats(); + + // Set Page Title + $data['page_title'] = __("QSL Statistics"); + + // Load Views + $this->load->view('interface_assets/header'); + $this->load->view('statistics/qsltable', $total_qsos); + $this->load->view('interface_assets/footer'); + } } diff --git a/application/locale/bg_BG/LC_MESSAGES/messages.po b/application/locale/bg_BG/LC_MESSAGES/messages.po index 5d2ae0201..30c2d9a29 100644 --- a/application/locale/bg_BG/LC_MESSAGES/messages.po +++ b/application/locale/bg_BG/LC_MESSAGES/messages.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Report-Msgid-Bugs-To: translations@wavelog.org\n" -"POT-Creation-Date: 2024-07-30 12:21+0000\n" +"POT-Creation-Date: 2024-07-30 12:45+0000\n" "PO-Revision-Date: 2024-07-09 13:25+0000\n" "Last-Translator: Anonymous \n" "Language-Team: Bulgarian \n" "Language-Team: Czech \n" "Language-Team: German \n" "Language-Team: Greek \n" "Language-Team: Spanish \n" "Language-Team: Finnish \n" "Language-Team: French \n" "Language-Team: Italian \n" "Language-Team: Dutch \n" "Language-Team: Polish \n" "Language-Team: Portuguese (Portugal) \n" -"Language-Team: Russian \n" +"Language-Team: Russian \n" "Language: ru_RU\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -23,6 +23,7 @@ msgstr "" #: application/controllers/Accumulated.php:21 #: application/views/interface_assets/header.php:148 +#: application/views/interface_assets/header.php:150 msgid "Accumulated Statistics" msgstr "Накопленная статистика" @@ -60,6 +61,7 @@ msgstr "Всего квадратов активировано" #: application/controllers/Activators.php:20 #: application/views/activators/index.php:2 #: application/views/interface_assets/header.php:140 +#: application/views/interface_assets/header.php:142 msgid "Gridsquare Activators" msgstr "Активаторы квадратов" @@ -81,6 +83,7 @@ msgstr "Экспорт ADIF" #: application/controllers/Adif.php:147 #: application/views/interface_assets/header.php:376 +#: application/views/interface_assets/header.php:378 msgid "ADIF Import / Export" msgstr "Импорт / Экспорт ADIF" @@ -156,6 +159,7 @@ msgstr "Действительный" #: application/controllers/Awards.php:22 #: application/views/interface_assets/header.php:156 #: application/views/qso/edit_ajax.php:35 +#: application/views/interface_assets/header.php:158 msgid "Awards" msgstr "Дипломы" @@ -189,6 +193,7 @@ msgstr "Дипломы - %s" #: application/views/qso/edit_ajax.php:361 application/views/qso/index.php:264 #: application/views/qso/index.php:508 application/views/user/edit.php:603 #: application/views/view_log/qso.php:351 +#: application/views/interface_assets/header.php:194 msgid "DOK" msgstr "DOK" @@ -211,6 +216,7 @@ msgstr "DOK" #: application/views/stationsetup/linkedlocations.php:17 #: application/views/stationsetup/linkedlocations.php:33 #: application/views/timeplotter/index.php:24 +#: application/views/interface_assets/header.php:164 msgid "DXCC" msgstr "DXCC" @@ -220,11 +226,13 @@ msgstr "Дипломы — WAJA" #: application/controllers/Awards.php:327 application/views/bands/index.php:51 #: application/views/interface_assets/header.php:208 +#: application/views/interface_assets/header.php:210 msgid "JCC" msgstr "JCC" #: application/controllers/Awards.php:375 application/views/bands/index.php:57 #: application/views/interface_assets/header.php:168 +#: application/views/interface_assets/header.php:170 msgid "VUCC" msgstr "VUCC" @@ -285,6 +293,7 @@ msgstr " и " #: application/views/user/edit.php:323 #: application/views/view_log/partial/log_ajax.php:9 #: application/views/visitor/index.php:21 +#: application/views/interface_assets/header.php:178 msgid "SOTA" msgstr "SOTA" @@ -305,6 +314,7 @@ msgstr "SOTA" #: application/views/user/edit.php:279 application/views/user/edit.php:301 #: application/views/user/edit.php:324 #: application/views/view_log/partial/log_ajax.php:10 +#: application/views/interface_assets/header.php:172 msgid "WWFF" msgstr "WWFF" @@ -325,6 +335,7 @@ msgstr "WWFF" #: application/views/user/edit.php:280 application/views/user/edit.php:302 #: application/views/user/edit.php:325 #: application/views/view_log/partial/log_ajax.php:11 +#: application/views/interface_assets/header.php:182 msgid "POTA" msgstr "POTA" @@ -340,6 +351,7 @@ msgstr "Worked All States (WAS)" #: application/controllers/Awards.php:714 application/views/bands/index.php:53 #: application/views/interface_assets/header.php:186 +#: application/views/interface_assets/header.php:188 msgid "RAC" msgstr "RAC" @@ -354,6 +366,7 @@ msgstr "IOTA (Island On The Air)" #: application/controllers/Awards.php:858 #: application/controllers/Awards.php:872 #: application/views/interface_assets/header.php:228 +#: application/views/interface_assets/header.php:230 msgid "US Counties" msgstr "US Counties" @@ -387,6 +400,7 @@ msgstr "Fred Fish Memorial Award (FFMA)" #: application/controllers/Awards.php:1125 #: application/views/interface_assets/header.php:166 #: application/views/logbookadvanced/useroptions.php:138 +#: application/views/interface_assets/header.php:168 msgid "SIG" msgstr "SIG" @@ -401,6 +415,7 @@ msgstr "Зоны ITU" #: application/controllers/Backup.php:15 application/views/backup/main.php:14 #: application/views/interface_assets/header.php:272 +#: application/views/interface_assets/header.php:274 msgid "Backup" msgstr "Резервное копирование" @@ -417,6 +432,7 @@ msgstr "Резервное копирование заметок" #: application/views/interface_assets/header.php:371 #: application/views/statistics/index.php:16 #: application/views/statistics/index.php:56 +#: application/views/interface_assets/header.php:373 msgid "Bands" msgstr "Диапазоны" @@ -442,6 +458,7 @@ msgstr "Экспорт Cabrillo" #: application/controllers/Cfdexport.php:20 #: application/views/interface_assets/header.php:388 +#: application/views/interface_assets/header.php:390 msgid "CFD Export" msgstr "Экспорт CDF" @@ -459,6 +476,7 @@ msgstr "Ни один пользователь не сконфигурирова #: application/controllers/Contestcalendar.php:19 #: application/views/interface_assets/header.php:245 +#: application/views/interface_assets/header.php:247 msgid "Contest Calendar" msgstr "Календарь контестов" @@ -469,6 +487,7 @@ msgstr "Журнал контеста" #: application/controllers/Contesting.php:101 #: application/views/interface_assets/header.php:266 +#: application/views/interface_assets/header.php:268 msgid "Contests" msgstr "Контесты" @@ -480,11 +499,13 @@ msgstr "Обновить контест" #: application/views/awards/dxcc/index.php:83 #: application/views/awards/iota/index.php:57 #: application/views/interface_assets/header.php:152 +#: application/views/interface_assets/header.php:154 msgid "Continents" msgstr "Континенты" #: application/controllers/Cron.php:38 #: application/views/interface_assets/header.php:276 +#: application/views/interface_assets/header.php:278 msgid "Cron Manager" msgstr "Диспетчер задач" @@ -494,6 +515,7 @@ msgstr "Редактирование задачи" #: application/controllers/Csv.php:20 application/views/csv/index.php:3 #: application/views/interface_assets/header.php:384 +#: application/views/interface_assets/header.php:386 msgid "SOTA CSV Export" msgstr "Экспорт SOTA CSV" @@ -545,6 +567,7 @@ msgstr "" #: application/views/distances/index.php:5 #: application/views/distances/index.php:8 #: application/views/interface_assets/header.php:142 +#: application/views/interface_assets/header.php:144 msgid "Distances Worked" msgstr "Сработанные дистанции" @@ -559,11 +582,13 @@ msgstr "и диапазоне" #: application/controllers/Dxatlas.php:19 #: application/views/interface_assets/header.php:382 +#: application/views/interface_assets/header.php:384 msgid "DX Atlas Gridsquare Export" msgstr "Экспорт квадратов DX Atlas" #: application/controllers/Dxcalendar.php:10 #: application/views/interface_assets/header.php:243 +#: application/views/interface_assets/header.php:245 msgid "DX Calendar" msgstr "Календарь DX экспедиций" @@ -604,6 +629,7 @@ msgstr "скачать изображения eQSL" #: application/controllers/Gridmap.php:10 #: application/views/interface_assets/header.php:136 +#: application/views/interface_assets/header.php:138 msgid "Gridsquare Map" msgstr "Карта квадратов" @@ -631,6 +657,7 @@ msgstr "Не найдены QSO для загрузки." #: application/controllers/Kmlexport.php:24 #: application/views/interface_assets/header.php:380 #: application/views/kml/index.php:3 +#: application/views/interface_assets/header.php:382 msgid "KML Export" msgstr "Экспорт KML" @@ -1068,6 +1095,7 @@ msgstr "Страна" #: application/views/user/edit.php:299 application/views/user/edit.php:322 #: application/views/view_log/partial/log_ajax.php:8 #: application/views/visitor/index.php:18 +#: application/views/interface_assets/header.php:180 msgid "IOTA" msgstr "IOTA" @@ -1322,6 +1350,7 @@ msgstr "Быстрый поиск" #: application/views/lotw_views/index.php:12 #: application/views/lotw_views/upload_cert.php:3 #: application/views/user/edit.php:705 application/views/visitor/index.php:324 +#: application/views/interface_assets/header.php:417 msgid "Logbook of the World" msgstr "Logbook of the World" @@ -1348,6 +1377,7 @@ msgstr "LoTW. TQ8 не загружен" #: application/controllers/Mode.php:25 #: application/views/interface_assets/header.php:264 #: application/views/mode/index.php:15 +#: application/views/interface_assets/header.php:266 msgid "Modes" msgstr "Виды модуляции" @@ -1499,6 +1529,7 @@ msgstr "Поиск в журнале и OQRS" #: application/controllers/Oqrs.php:104 #: application/views/interface_assets/header.php:405 +#: application/views/interface_assets/header.php:407 msgid "OQRS Requests" msgstr "Запросы OQRS" @@ -1508,6 +1539,7 @@ msgstr "Калькулятор QRB" #: application/controllers/Qrz.php:173 #: application/views/interface_assets/header.php:418 +#: application/views/interface_assets/header.php:420 msgid "QRZ Logbook" msgstr "Журнал QRZ" @@ -1544,6 +1576,7 @@ msgstr "Добавить QSO" #: application/controllers/Radio.php:18 #: application/views/interface_assets/header.php:424 +#: application/views/interface_assets/header.php:426 msgid "Hardware Interfaces" msgstr "Аппаратные интерфейсы" @@ -1597,6 +1630,8 @@ msgstr "Спутниковые таймеры" #: application/views/search/main.php:33 #: application/views/visitor/layout/header.php:99 #: application/views/visitor/layout/header.php:100 +#: application/views/interface_assets/header.php:330 +#: application/views/interface_assets/header.php:337 msgid "Search" msgstr "Поиск" @@ -1648,6 +1683,8 @@ msgstr "Дубликат профиля QTH:" #: application/controllers/Stationsetup.php:35 #: application/views/interface_assets/header.php:369 #: application/views/interface_assets/header.php:480 +#: application/views/interface_assets/header.php:371 +#: application/views/interface_assets/header.php:482 msgid "Station Setup" msgstr "Настройка станции" @@ -1714,6 +1751,7 @@ msgstr "Установить как активный" #: application/views/interface_assets/header.php:478 #: application/views/stationsetup/stationsetup.php:46 #: application/views/view_log/index.php:4 +#: application/views/interface_assets/header.php:480 msgid "Active Logbook" msgstr "Активный журнал" @@ -1854,6 +1892,7 @@ msgstr "Пользовательская статистика" #: application/controllers/Themes.php:27 #: application/views/interface_assets/header.php:270 +#: application/views/interface_assets/header.php:272 msgid "Themes" msgstr "Темы оформления" @@ -1868,12 +1907,14 @@ msgstr "Редактировать тему" #: application/controllers/Timeline.php:17 #: application/views/interface_assets/header.php:146 #: application/views/timeline/index.php:2 +#: application/views/interface_assets/header.php:148 msgid "Timeline" msgstr "Лента событий" #: application/controllers/Timeplotter.php:17 #: application/views/interface_assets/header.php:150 #: application/views/timeplotter/index.php:9 +#: application/views/interface_assets/header.php:152 msgid "Timeplotter" msgstr "Графики" @@ -1915,6 +1956,7 @@ msgstr "Префиксы DXCC:" #: application/controllers/User.php:12 #: application/views/interface_assets/header.php:260 +#: application/views/interface_assets/header.php:262 msgid "User Accounts" msgstr "Аккаунты пользователей" @@ -1959,6 +2001,7 @@ msgstr "Вход не выполнен. Попробуйте снова." #: application/views/interface_assets/header.php:348 #: application/views/user/login.php:89 #: application/views/visitor/layout/header.php:88 +#: application/views/interface_assets/header.php:350 msgid "Login" msgstr "Вход" @@ -2043,6 +2086,7 @@ msgstr "Экспорт карты" #: application/controllers/Webadif.php:90 #: application/controllers/Webadif.php:137 #: application/views/interface_assets/header.php:419 +#: application/views/interface_assets/header.php:421 msgid "QO-100 Dx Club Upload" msgstr "Загрузка в QO-100 Dx Club" @@ -2932,6 +2976,7 @@ msgstr "Сохранить" #: application/views/api/help.php:14 #: application/views/interface_assets/header.php:423 +#: application/views/interface_assets/header.php:425 msgid "API Keys" msgstr "ключи API" @@ -3164,6 +3209,8 @@ msgstr "Подтверждённые графства" #: application/views/statistics/uniquetable.php:10 #: application/views/statistics/uniquetable.php:23 #: application/views/visitor/index.php:241 +#: application/views/statistics/qsltable.php:54 +#: application/views/statistics/qsltable.php:109 msgid "Total" msgstr "Всего" @@ -3585,6 +3632,7 @@ msgstr "Префикс" #: application/views/awards/ffma/index.php:8 #: application/views/interface_assets/header.php:234 +#: application/views/interface_assets/header.php:236 msgid "Fred Fish Memorial Award" msgstr "Fred Fish Memorial Award" @@ -3705,6 +3753,7 @@ msgstr "Кантон" #: application/views/awards/index.php:9 application/views/bands/index.php:46 #: application/views/interface_assets/header.php:160 +#: application/views/interface_assets/header.php:162 msgid "CQ" msgstr "CQ" @@ -4378,11 +4427,13 @@ msgstr "Графство США" #: application/views/bands/index.php:58 #: application/views/interface_assets/header.php:206 +#: application/views/interface_assets/header.php:208 msgid "WAJA" msgstr "WAJA" #: application/views/bands/index.php:59 #: application/views/interface_assets/header.php:230 +#: application/views/interface_assets/header.php:232 msgid "WAS" msgstr "WAS" @@ -4694,6 +4745,7 @@ msgstr "название для ADIF" #: application/views/mode/create.php:46 application/views/mode/create.php:48 #: application/views/mode/edit.php:57 application/views/mode/edit.php:60 #: application/views/mode/index.php:43 +#: application/views/interface_assets/header.php:460 msgid "Active" msgstr "Активный" @@ -5396,6 +5448,7 @@ msgstr "Квадраты VUCC" #: application/views/dayswithqso/index.php:2 #: application/views/interface_assets/header.php:144 +#: application/views/interface_assets/header.php:146 msgid "Days with QSOs" msgstr "Дней с QSO" @@ -5890,6 +5943,7 @@ msgstr "Загрузить QSO" #: application/views/eqsl/import.php:15 application/views/eqsl/result.php:17 #: application/views/eqsl/tools.php:15 #: application/views/interface_assets/header.php:241 +#: application/views/interface_assets/header.php:243 msgid "Tools" msgstr "Инструменты" @@ -6220,6 +6274,7 @@ msgstr "Режим распространения не поддерживает #: application/views/interface_assets/footer.php:127 #: application/views/interface_assets/header.php:426 #: application/views/options/sidebar.php:11 +#: application/views/interface_assets/header.php:428 msgid "Version Info" msgstr "Информация о версии" @@ -6296,80 +6351,99 @@ msgid "Analytics" msgstr "Аналитика" #: application/views/interface_assets/header.php:138 +#: application/views/interface_assets/header.php:140 msgid "Activated Gridsquares" msgstr "Активированные квадраты" #: application/views/interface_assets/header.php:158 +#: application/views/interface_assets/header.php:160 msgid "International" msgstr "Международные" #: application/views/interface_assets/header.php:164 +#: application/views/interface_assets/header.php:166 msgid "ITU" msgstr "ITU" #: application/views/interface_assets/header.php:184 +#: application/views/interface_assets/header.php:186 msgid "Canada" msgstr "Канада" #: application/views/interface_assets/header.php:190 +#: application/views/interface_assets/header.php:192 msgid "Germany" msgstr "Германия" #: application/views/interface_assets/header.php:194 +#: application/views/interface_assets/header.php:196 msgid "DL Gridmaster" msgstr "DL Gridmaster" #: application/views/interface_assets/header.php:198 +#: application/views/interface_assets/header.php:200 msgid "Great Britain" msgstr "Великобритания" #: application/views/interface_assets/header.php:200 +#: application/views/interface_assets/header.php:202 msgid "WAB" msgstr "WAB" #: application/views/interface_assets/header.php:204 +#: application/views/interface_assets/header.php:206 msgid "Japan" msgstr "Япония" #: application/views/interface_assets/header.php:210 +#: application/views/interface_assets/header.php:212 msgid "JA Gridmaster" msgstr "JA Gridmaster" #: application/views/interface_assets/header.php:214 +#: application/views/interface_assets/header.php:216 msgid "Luxemburg" msgstr "Люксембург" #: application/views/interface_assets/header.php:216 +#: application/views/interface_assets/header.php:218 msgid "LX Gridmaster" msgstr "LX Gridmaster" #: application/views/interface_assets/header.php:220 +#: application/views/interface_assets/header.php:222 msgid "Switzerland" msgstr "Швейцария" #: application/views/interface_assets/header.php:226 +#: application/views/interface_assets/header.php:228 msgid "USA" msgstr "США" #: application/views/interface_assets/header.php:232 +#: application/views/interface_assets/header.php:234 msgid "US Gridmaster" msgstr "US Gridmaster" #: application/views/interface_assets/header.php:249 +#: application/views/interface_assets/header.php:251 msgid "Bandmap" msgstr "План диапазонов" #: application/views/interface_assets/header.php:251 +#: application/views/interface_assets/header.php:253 msgid "SAT Timers" msgstr "Спутниковые таймеры" #: application/views/interface_assets/header.php:257 #: application/views/station_profile/index.php:33 #: application/views/stationsetup/stationsetup.php:113 +#: application/views/interface_assets/header.php:259 msgid "Admin" msgstr "Администрирование" #: application/views/interface_assets/header.php:262 +#: application/views/interface_assets/header.php:264 msgid "Global Options" msgstr "Общие настройки" @@ -6380,22 +6454,27 @@ msgstr "Общие настройки" #: application/views/statistics/custom_result.php:21 #: application/views/statistics/index.php:39 #: application/views/statistics/index.php:93 +#: application/views/interface_assets/header.php:270 msgid "Satellites" msgstr "Спутники" #: application/views/interface_assets/header.php:274 +#: application/views/interface_assets/header.php:276 msgid "Update Country Files" msgstr "Обновить файлы стран" #: application/views/interface_assets/header.php:278 +#: application/views/interface_assets/header.php:280 msgid "Debug Information" msgstr "Отладочная информация" #: application/views/interface_assets/header.php:325 +#: application/views/interface_assets/header.php:327 msgid "Add/Search Callsign" msgstr "Добавить/найти позывной" #: application/views/interface_assets/header.php:327 +#: application/views/interface_assets/header.php:329 msgid "Log" msgstr "Журнал" @@ -6403,59 +6482,73 @@ msgstr "Журнал" #: application/views/logbookadvanced/index.php:447 #: application/views/oqrs/index.php:27 application/views/user/edit.php:441 #: application/views/visitor/layout/header.php:97 +#: application/views/interface_assets/header.php:336 msgid "Search Callsign" msgstr "Поиск позывного" #: application/views/interface_assets/header.php:363 #: application/views/user/edit.php:49 +#: application/views/interface_assets/header.php:365 msgid "Account" msgstr "Информация об аккаунте" #: application/views/interface_assets/header.php:378 +#: application/views/interface_assets/header.php:380 msgid "Other Export Options" msgstr "Другие варианты экспорта" #: application/views/interface_assets/header.php:386 +#: application/views/interface_assets/header.php:388 msgid "Cabrillo Export" msgstr "Экспорт Cabrillo" #: application/views/interface_assets/header.php:410 +#: application/views/interface_assets/header.php:412 msgid "QSL Queue" msgstr "Очередь QSL" #: application/views/interface_assets/header.php:411 +#: application/views/interface_assets/header.php:413 msgid "Labels" msgstr "Наклейки" #: application/views/interface_assets/header.php:413 +#: application/views/interface_assets/header.php:415 msgid "Third-Party Services" msgstr "Сторонние сервисы" #: application/views/interface_assets/header.php:416 +#: application/views/interface_assets/header.php:418 msgid "eQSL Import / Export" msgstr "импорт / экспорт eQSL" #: application/views/interface_assets/header.php:417 +#: application/views/interface_assets/header.php:419 msgid "HRDLog Logbook" msgstr "Журнал HRDLog" #: application/views/interface_assets/header.php:427 +#: application/views/interface_assets/header.php:429 msgid "Help" msgstr "Помощь" #: application/views/interface_assets/header.php:428 +#: application/views/interface_assets/header.php:430 msgid "Forum" msgstr "Форум" #: application/views/interface_assets/header.php:430 +#: application/views/interface_assets/header.php:432 msgid "Logout" msgstr "Выход" #: application/views/interface_assets/header.php:438 +#: application/views/interface_assets/header.php:440 msgid "Select a Location" msgstr "Выберите профиль QTH" #: application/views/interface_assets/header.php:517 +#: application/views/interface_assets/header.php:519 msgid "Extras" msgstr "Дополнения" @@ -10880,6 +10973,12 @@ msgstr "Wavelog был успешно обновлен!" msgid "Callsign: " msgstr "" +#: application/controllers/Statistics.php:232 +#: application/views/interface_assets/header.php:136 +#: application/views/statistics/qsltable.php:5 +msgid "QSL Statistics" +msgstr "" + #~ msgid "VHF/UHF Century Club (VUCC)" #~ msgstr "VHF / UHF Century Club (VUCC)" diff --git a/application/locale/sv_SE/LC_MESSAGES/messages.po b/application/locale/sv_SE/LC_MESSAGES/messages.po index a58d30173..6a0b49ada 100644 --- a/application/locale/sv_SE/LC_MESSAGES/messages.po +++ b/application/locale/sv_SE/LC_MESSAGES/messages.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Report-Msgid-Bugs-To: translations@wavelog.org\n" -"POT-Creation-Date: 2024-07-30 12:21+0000\n" +"POT-Creation-Date: 2024-07-30 12:45+0000\n" "PO-Revision-Date: 2024-07-09 13:26+0000\n" "Last-Translator: Anonymous \n" "Language-Team: Swedish \n" "Language-Team: Turkish \n" "Language-Team: Chinese (Simplified) db->select('COL_CALL, COL_BAND, COL_TIME_ON, COL_RST_RCVD, COL_RST_SENT, COL_MODE, COL_NAME, COL_COUNTRY, COL_PRIMARY_KEY, COL_SAT_NAME'); - - $this->db->where('COL_TIME_ON >=', $this->input->post('start_date')); - $this->db->where('COL_TIME_OFF <=', $this->input->post('end_date')); - + + $this->db->where('COL_TIME_ON >=', $this->input->post('start_date')); + $this->db->where('COL_TIME_OFF <=', $this->input->post('end_date')); + if($this->input->post('band_6m') == "6m") { - $this->db->where('COL_BAND', $this->input->post('band_6m')); + $this->db->where('COL_BAND', $this->input->post('band_6m')); } - + if($this->input->post('band_2m') == "2m") { - $this->db->where('COL_BAND', $this->input->post('band_2m')); + $this->db->where('COL_BAND', $this->input->post('band_2m')); } - + if($this->input->post('band_70cm') == "70cm") { - $this->db->where('COL_BAND', $this->input->post('band_70cm')); + $this->db->where('COL_BAND', $this->input->post('band_70cm')); } - + if($this->input->post('band_23cm') == "23cm") { - $this->db->where('COL_BAND', $this->input->post('band_23cm')); + $this->db->where('COL_BAND', $this->input->post('band_23cm')); } - + if($this->input->post('band_3cm') == "3cm") { - $this->db->where('COL_BAND', $this->input->post('band_3cm')); + $this->db->where('COL_BAND', $this->input->post('band_3cm')); } - + // Select Voice QSOs if($this->input->post('mode_data') == "data") { if($this->input->post('mode_ssb') != "ssb") { @@ -45,29 +45,29 @@ $this->db->where('COL_MODE !=', 'AM'); } } - + // Select Voice QSOs if($this->input->post('mode_ssb') == "ssb") { - $this->db->where('COL_MODE', $this->input->post('mode_ssb')); + $this->db->where('COL_MODE', $this->input->post('mode_ssb')); $this->db->or_where('COL_MODE', 'USB'); - $this->db->or_where('COL_MODE', 'LSB'); + $this->db->or_where('COL_MODE', 'LSB'); } - + // Select CW QSOs if($this->input->post('mode_cw') == "cw") { - $this->db->where('COL_MODE', $this->input->post('mode_ssb')); + $this->db->where('COL_MODE', $this->input->post('mode_ssb')); } - + // Select FM QSOs if($this->input->post('mode_fm') == "fm") { - $this->db->where('COL_MODE', $this->input->post('mode_ssb')); + $this->db->where('COL_MODE', $this->input->post('mode_ssb')); } - + // Select AM QSOs if($this->input->post('mode_am') == "am") { - $this->db->where('COL_MODE', $this->input->post('mode_am')); + $this->db->where('COL_MODE', $this->input->post('mode_am')); } - + return $this->db->get($this->config->item('table_name')); } @@ -79,7 +79,7 @@ $satunique = $this->getUniqueSatCallsignsSat(); $modeunique = $this->getUniqueSatCallsignsModes(); - + // Generating the band/mode table foreach ($sats as $sat) { $sattotal[$sat] = 0; @@ -133,7 +133,7 @@ $modecalls=[]; $bandcalls=[]; - + // Generating the band/mode table foreach ($bands as $band) { $bandtotal[$band] = 0; @@ -178,19 +178,19 @@ function getUniqueSatCallsignsSat() { $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; } $bands = array(); - + $this->db->select('count(distinct col_call) as calls, upper(col_sat_name) as sat', FALSE); $this->db->where('col_prop_mode', 'SAT'); $this->db->where('coalesce(col_sat_name,"") != ""'); $this->db->where_in('station_id', $logbooks_locations_array); $this->db->group_by('upper(col_sat_name)'); - + $query = $this->db->get($this->config->item('table_name')); return $query->result(); @@ -199,59 +199,57 @@ function getUniqueSatCallsigns() { $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; } $bands = array(); - + $this->db->select('count(distinct col_call) as calls, upper(col_sat_name) as sat, col_mode, coalesce(col_submode, "") col_submode', FALSE); $this->db->where('col_prop_mode', 'SAT'); $this->db->where('coalesce(col_sat_name,"") != ""'); $this->db->where_in('station_id', $logbooks_locations_array); $this->db->group_by('upper(col_sat_name), col_mode, coalesce(col_submode, "")'); - + $query = $this->db->get($this->config->item('table_name')); return $query->result(); } function getUniqueCallsigns() { - $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; } $bands = array(); - + $this->db->select('count(distinct col_call) as calls, lower(col_band) as band, col_mode, coalesce(col_submode, "") col_submode', FALSE); $this->db->where_in('station_id', $logbooks_locations_array); $this->db->group_by('lower(col_band), col_mode, coalesce(col_submode, "")'); - + $query = $this->db->get($this->config->item('table_name')); return $query->result(); } function getUniqueCallsignsModes() { - $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; } $bands = array(); - + $this->db->select('count(distinct col_call) as calls, col_mode, coalesce(col_submode, "") col_submode', FALSE); $this->db->where_in('station_id', $logbooks_locations_array); $this->db->group_by('col_mode, coalesce(col_submode, "")'); - + $query = $this->db->get($this->config->item('table_name')); return $query->result(); @@ -260,39 +258,38 @@ function getUniqueSatCallsignsModes() { $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; } $bands = array(); - + $this->db->select('count(distinct col_call) as calls, col_mode, coalesce(col_submode, "") col_submode', FALSE); $this->db->where('coalesce(col_sat_name,"") != ""'); $this->db->where('col_prop_mode', 'SAT'); $this->db->where_in('station_id', $logbooks_locations_array); $this->db->group_by('col_mode, coalesce(col_submode, "")'); - + $query = $this->db->get($this->config->item('table_name')); return $query->result(); } function getUniqueCallsignsBands() { - $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; } $bands = array(); - + $this->db->select('count(distinct col_call) as calls, col_band as band', FALSE); $this->db->where_in('station_id', $logbooks_locations_array); $this->db->group_by('col_band'); - + $query = $this->db->get($this->config->item('table_name')); return $query->result(); @@ -301,37 +298,36 @@ function getUniqueSatCallsignsTotal() { $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; } $bands = array(); - + $this->db->select('count(distinct col_call) as calls', FALSE); $this->db->where('coalesce(col_sat_name,"") != ""'); $this->db->where('col_prop_mode', 'SAT'); $this->db->where_in('station_id', $logbooks_locations_array); - + $query = $this->db->get($this->config->item('table_name')); return $query->row(); } function getUniqueCallsignsTotal() { - $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; } $bands = array(); - + $this->db->select('count(distinct col_call) as calls', FALSE); $this->db->where_in('station_id', $logbooks_locations_array); - + $query = $this->db->get($this->config->item('table_name')); return $query->row(); @@ -412,42 +408,167 @@ return $result; } + function total_qsls() { + $qsoView = array(); + $qsoSatView = array(); + + $bands = $this->get_bands(); + $modes = $this->get_modes(); + + $sats = $this->get_sats(); + $satmodes = $this->get_sat_modes(); + + // Generating the band/mode table + foreach ($bands as $band) { + foreach ($modes as $mode) { + $qsoView [$mode][$band]['qso'] = '0'; + $qsoView [$mode][$band]['qsl'] = '0'; + $qsoView [$mode][$band]['lotw'] = '0'; + $qsoView [$mode][$band]['qrz'] = '0'; + $qsoView [$mode][$band]['eqsl'] = '0'; + $qsoView [$mode][$band]['clublog'] = '0'; + } + } + + // Populating array with numbers + $workedQso = $this->modeBandQsl(); + foreach ($workedQso as $line) { + if ($line->col_submode == null || $line->col_submode == "") { + $qsoView [$line->col_mode] [$line->band] ['qso'] = $line->qsos; + $qsoView [$line->col_mode] [$line->band] ['qsl'] = $line->qsl; + $qsoView [$line->col_mode] [$line->band] ['lotw'] = $line->lotw; + $qsoView [$line->col_mode] [$line->band] ['qrz'] = $line->qrz; + $qsoView [$line->col_mode] [$line->band] ['eqsl'] = $line->eqsl; + $qsoView [$line->col_mode] [$line->band] ['clublog'] = $line->clublog; + } else { + $qsoView [$line->col_submode] [$line->band] ['qso'] = $line->qsos; + $qsoView [$line->col_submode] [$line->band] ['qsl'] = $line->qsl; + $qsoView [$line->col_submode] [$line->band] ['lotw'] = $line->lotw; + $qsoView [$line->col_submode] [$line->band] ['qrz'] = $line->qrz; + $qsoView [$line->col_submode] [$line->band] ['eqsl'] = $line->eqsl; + $qsoView [$line->col_submode] [$line->band] ['clublog'] = $line->clublog; + } + } + + // Generating the band/mode table + foreach ($sats as $sat) { + foreach ($satmodes as $mode) { + $qsoSatView [$mode][$sat]['qso'] = '0'; + $qsoSatView [$mode][$sat]['qsl'] = '0'; + $qsoSatView [$mode][$sat]['lotw'] = '0'; + $qsoSatView [$mode][$sat]['qrz'] = '0'; + $qsoSatView [$mode][$sat]['eqsl'] = '0'; + $qsoSatView [$mode][$sat]['clublog'] = '0'; + } + } + + // Populating array with numbers + $workedSatQso = $this->modeSatQsl(); + foreach ($workedSatQso as $line) { + if ($line->col_submode == null || $line->col_submode == "") { + $qsoSatView [$line->col_mode] [$line->sat] ['qso'] = $line->qsos; + $qsoSatView [$line->col_mode] [$line->sat] ['qsl'] = $line->qsl; + $qsoSatView [$line->col_mode] [$line->sat] ['lotw'] = $line->lotw; + $qsoSatView [$line->col_mode] [$line->sat] ['qrz'] = $line->qrz; + $qsoSatView [$line->col_mode] [$line->sat] ['eqsl'] = $line->eqsl; + $qsoSatView [$line->col_mode] [$line->sat] ['clublog'] = $line->clublog; + } else { + $qsoSatView [$line->col_submode] [$line->sat] ['qso'] = $line->qsos; + $qsoSatView [$line->col_submode] [$line->sat] ['qsl'] = $line->qsl; + $qsoSatView [$line->col_submode] [$line->sat] ['lotw'] = $line->lotw; + $qsoSatView [$line->col_submode] [$line->sat] ['qrz'] = $line->qrz; + $qsoSatView [$line->col_submode] [$line->sat] ['eqsl'] = $line->eqsl; + $qsoSatView [$line->col_submode] [$line->sat] ['clublog'] = $line->clublog; + } + } + + $result['qsoView'] = $qsoView; + $result['qsoSatView'] = $qsoSatView; + + return $result; + } + + function modeBandQsl() { + $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; + } + + $sql = "select lower(col_band) as band, col_mode, coalesce(col_submode, '') col_submode, + count(*) qsos, + count(case when COL_QSL_RCVD='Y' then 1 end) qsl, + count(case when COL_EQSL_QSL_RCVD='Y' then 1 end) eqsl, + count(case when COL_LOTW_QSL_RCVD='Y' then 1 end) lotw, + count(case when COL_QRZCOM_QSO_DOWNLOAD_STATUS='Y' then 1 end) qrz, + count(case when COL_CLUBLOG_QSO_DOWNLOAD_STATUS='Y' then 1 end) clublog + from " . $this->config->item('table_name') . " + where station_id in (". implode(',', $logbooks_locations_array) .") + and col_prop_mode <> 'SAT' + group by lower(col_band), col_mode, coalesce(col_submode, '')"; + + $result = $this->db->query($sql); + return $result->result(); + } + + function modeSatQsl() { + $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; + } + + $sql = "select upper(col_sat_name) as sat, col_mode, coalesce(col_submode, '') col_submode, + count(*) qsos, + count(case when COL_QSL_RCVD='Y' then 1 end) qsl, + count(case when COL_EQSL_QSL_RCVD='Y' then 1 end) eqsl, + count(case when COL_LOTW_QSL_RCVD='Y' then 1 end) lotw, + count(case when COL_QRZCOM_QSO_DOWNLOAD_STATUS='Y' then 1 end) qrz, + count(case when COL_CLUBLOG_QSO_DOWNLOAD_STATUS='Y' then 1 end) clublog + from " . $this->config->item('table_name') . " + where station_id in (". implode(',', $logbooks_locations_array) .") + and col_prop_mode = 'SAT' + group by upper(col_sat_name), col_mode, coalesce(col_submode, '')"; + + $result = $this->db->query($sql); + return $result->result(); + } + function modeSatQso() { $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; + return null; } $bands = array(); - + $this->db->select('count(*) as count, upper(col_sat_name) as sat, col_mode, coalesce(col_submode, "") col_submode', FALSE); $this->db->where('coalesce(col_sat_name,"") != ""'); $this->db->where('col_prop_mode', 'SAT'); $this->db->where_in('station_id', $logbooks_locations_array); $this->db->group_by('upper(col_sat_name), col_mode, coalesce(col_submode, "")'); - + $query = $this->db->get($this->config->item('table_name')); return $query->result(); } function modeBandQso() { - $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; + return null; } - $bands = array(); - $this->db->select('count(*) as count, lower(col_band) as band, col_mode, coalesce(col_submode, "") col_submode', FALSE); $this->db->where_in('station_id', $logbooks_locations_array); $this->db->group_by('lower(col_band), col_mode, coalesce(col_submode, "")'); - + $query = $this->db->get($this->config->item('table_name')); return $query->result(); @@ -456,62 +577,72 @@ function get_sats() { $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; + return null; } $sats = array(); - + $this->db->select('distinct col_sat_name as satsort, upper(col_sat_name) as sat', FALSE); $this->db->where('coalesce(col_sat_name,"") != ""'); $this->db->where('col_prop_mode', 'SAT'); $this->db->where_in('station_id', $logbooks_locations_array); $this->db->order_by('satsort', 'asc'); - + $query = $this->db->get($this->config->item('table_name')); foreach($query->result() as $sat){ array_push($sats, $sat->sat); } - return $sats; } function get_bands() { - $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; + return null; } $bands = array(); - + $this->db->select('distinct col_band+0 as bandsort, lower(col_band) as band', FALSE); $this->db->where_in('station_id', $logbooks_locations_array); $this->db->order_by('bandsort', 'desc'); - + $query = $this->db->get($this->config->item('table_name')); foreach($query->result() as $band){ array_push($bands, $band->band); } - + + usort( + $bands, + function($b, $a) { + sscanf($a, '%f%s', $ac, $ar); + sscanf($b, '%f%s', $bc, $br); + if ($ar == $br) { + return ($ac < $bc) ? -1 : 1; + } + return ($ar < $br) ? -1 : 1; + } + ); + return $bands; } function get_sat_modes() { $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; + return null; } $modes = array(); - + $this->db->select('distinct col_mode, coalesce(col_submode, "") col_submode', FALSE); $this->db->where('coalesce(col_sat_name,"") != ""'); $this->db->where('col_prop_mode', 'SAT'); @@ -519,7 +650,7 @@ $this->db->order_by('col_mode, col_submode', 'ASC'); $query = $this->db->get($this->config->item('table_name')); - + foreach($query->result() as $mode){ if ($mode->col_submode == null || $mode->col_submode == "") { array_push($modes, $mode->col_mode); @@ -530,24 +661,23 @@ return $modes; } - + function get_modes() { - $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; + return null; } $modes = array(); - + $this->db->select('distinct col_mode, coalesce(col_submode, "") col_submode', FALSE); $this->db->where_in('station_id', $logbooks_locations_array); $this->db->order_by('col_mode, col_submode', 'ASC'); $query = $this->db->get($this->config->item('table_name')); - + foreach($query->result() as $mode){ if ($mode->col_submode == null || $mode->col_submode == "") { array_push($modes, $mode->col_mode); diff --git a/application/views/interface_assets/footer.php b/application/views/interface_assets/footer.php index a2dcb1592..c38c60219 100644 --- a/application/views/interface_assets/footer.php +++ b/application/views/interface_assets/footer.php @@ -200,7 +200,7 @@ if($this->session->userdata('user_id') != null) { -uri->segment(1) == "statistics") { ?> +uri->segment(1) == "statistics" && $this->uri->segment(2) == "") { ?> diff --git a/application/views/interface_assets/header.php b/application/views/interface_assets/header.php index b4240c5c3..03917d896 100644 --- a/application/views/interface_assets/header.php +++ b/application/views/interface_assets/header.php @@ -133,6 +133,8 @@
    • +
    • +
    • @@ -402,7 +404,7 @@ if (!($this->config->item('disable_oqrs') ?? false)) { $oqrs_requests = $this->oqrs_model->oqrs_requests($location_list); ?> -
  • +
  • 0) { echo "" . $oqrs_requests . ""; } ?>
    • diff --git a/application/views/statistics/qsltable.php b/application/views/statistics/qsltable.php new file mode 100644 index 000000000..ff947a0c5 --- /dev/null +++ b/application/views/statistics/qsltable.php @@ -0,0 +1,122 @@ +
    +
    +
    +
    + +
    +
    + + + '; + echo ''; + echo ''; + echo ' + + '; + echo ''; + echo ''; + echo ''; + echo ''; + echo ''; + echo ''; + echo ''; + echo ''; + $qsototal = 0; + $qsltotal = 0; + $lotwtotal = 0; + $eqsltotal = 0; + $qrztotal = 0; + $clublogtotal = 0; + foreach ($qsoarray as $mode => $value) { + $qsototal += $value[$band]['qso']; + $qsltotal += $value[$band]['qsl']; + $lotwtotal += $value[$band]['lotw']; + $eqsltotal += $value[$band]['eqsl']; + $qrztotal += $value[$band]['qrz']; + $clublogtotal += $value[$band]['clublog']; + $total = $value[$band]['qso'] + $value[$band]['qsl'] + $value[$band]['lotw'] + $value[$band]['eqsl'] + $value[$band]['qrz'] + $value[$band]['clublog']; + if ($total > 0) { + echo ' + '; + echo ''; + echo ''; + echo ''; + echo ''; + echo ''; + echo ''; + echo ''; + } + } + echo ''; + echo ''; + echo ''; + echo ''; + echo ''; + echo ''; + echo ''; + echo '
    ' . $band . '
    QSOQSLLoTWeQSLQRZClublog
    '. $mode .'' . $value[$band]['qso'] . '' . $value[$band]['qsl'] . '' . $value[$band]['lotw'] . '' . $value[$band]['eqsl'] . '' . $value[$band]['qrz'] . '' . $value[$band]['clublog'] . '
    '.__("Total").'' . $qsototal . '' . $qsltotal . '' . $lotwtotal . '' . $eqsltotal . '' . $qrztotal . '' . $clublogtotal . '
    '; + } + } + if ($qsosatarray) { + foreach($sats as $sat) { + echo ' +
    + + '; + echo ''; + echo ''; + echo ' + + '; + echo ''; + echo ''; + echo ''; + echo ''; + echo ''; + echo ''; + echo ''; + echo ''; + $qsototal = 0; + $qsltotal = 0; + $lotwtotal = 0; + $eqsltotal = 0; + $qrztotal = 0; + $clublogtotal = 0; + foreach ($qsosatarray as $mode => $value) { + $qsototal += $value[$sat]['qso']; + $qsltotal += $value[$sat]['qsl']; + $lotwtotal += $value[$sat]['lotw']; + $eqsltotal += $value[$sat]['eqsl']; + $qrztotal += $value[$sat]['qrz']; + $clublogtotal += $value[$sat]['clublog']; + $total = $value[$sat]['qso'] + $value[$sat]['qsl'] + $value[$sat]['lotw'] + $value[$sat]['eqsl'] + $value[$sat]['qrz'] + $value[$sat]['clublog']; + if ($total > 0) { + echo ' + '; + echo ''; + echo ''; + echo ''; + echo ''; + echo ''; + echo ''; + echo ''; + } + } + echo ''; + echo ''; + echo ''; + echo ''; + echo ''; + echo ''; + echo ''; + echo '
    ' . $sat . '
    QSOQSLLoTWeQSLQRZClublog
    '. $mode .'' . $value[$sat]['qso'] . '' . $value[$sat]['qsl'] . '' . $value[$sat]['lotw'] . '' . $value[$sat]['eqsl'] . '' . $value[$sat]['qrz'] . '' . $value[$sat]['clublog'] . '
    '.__("Total").'' . $qsototal . '' . $qsltotal . '' . $lotwtotal . '' . $eqsltotal . '' . $qrztotal . '' . $clublogtotal . '
    '; + } + } + ?> +
    +
    + diff --git a/assets/css/general.css b/assets/css/general.css index eb33b4fa5..83c746ef4 100644 --- a/assets/css/general.css +++ b/assets/css/general.css @@ -1048,10 +1048,26 @@ label { text-transform: uppercase; } +.tables-container { + display: flex; + flex-wrap: wrap; + gap: 10px; /* Optional: add some space between tables */ + justify-content: center; + overflow-x: auto; /* Enable horizontal scrolling if needed */ + max-width: 100%; /* Ensure the container doesn't exceed the viewport width */ + padding: 10px; /* Optional: add some padding */ + box-sizing: border-box; +} + +.table-wrapper { + flex: 1 1 400px; /* Adjust the base width of tables */ + box-sizing: border-box; +} + .multiselect-container.dropdown-menu { --bs-dropdown-padding-y: 0; } #dxcc + .btn-group .multiselect-container .multiselect-option input[type="radio"] { display: none; -} +} \ No newline at end of file diff --git a/assets/lang_src/messages.pot b/assets/lang_src/messages.pot index 6473178fd..49b8fd306 100644 --- a/assets/lang_src/messages.pot +++ b/assets/lang_src/messages.pot @@ -6,7 +6,7 @@ msgid "" msgstr "" "Report-Msgid-Bugs-To: translations@wavelog.org\n" -"POT-Creation-Date: 2024-07-30 12:21+0000\n" +"POT-Creation-Date: 2024-07-30 12:45+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,7 +17,7 @@ msgstr "" "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n" #: application/controllers/Accumulated.php:21 -#: application/views/interface_assets/header.php:148 +#: application/views/interface_assets/header.php:150 msgid "Accumulated Statistics" msgstr "" @@ -54,7 +54,7 @@ msgstr "" #: application/controllers/Activators.php:20 #: application/views/activators/index.php:2 -#: application/views/interface_assets/header.php:140 +#: application/views/interface_assets/header.php:142 msgid "Gridsquare Activators" msgstr "" @@ -75,7 +75,7 @@ msgid "ADIF Export" msgstr "" #: application/controllers/Adif.php:147 -#: application/views/interface_assets/header.php:376 +#: application/views/interface_assets/header.php:378 msgid "ADIF Import / Export" msgstr "" @@ -149,7 +149,7 @@ msgid "Valid" msgstr "" #: application/controllers/Awards.php:22 -#: application/views/interface_assets/header.php:156 +#: application/views/interface_assets/header.php:158 #: application/views/qso/edit_ajax.php:35 msgid "Awards" msgstr "" @@ -178,7 +178,7 @@ msgstr "" #: application/views/awards/dok/index.php:149 #: application/views/bands/index.php:47 #: application/views/contesting/index.php:170 -#: application/views/interface_assets/header.php:192 +#: application/views/interface_assets/header.php:194 #: application/views/logbookadvanced/index.php:613 #: application/views/logbookadvanced/useroptions.php:130 #: application/views/qso/edit_ajax.php:361 application/views/qso/index.php:264 @@ -191,7 +191,7 @@ msgstr "" #: application/views/bandmap/list.php:112 application/views/bands/index.php:48 #: application/views/csv/index.php:58 application/views/dxatlas/index.php:58 #: application/views/dxcalendar/index.php:11 -#: application/views/interface_assets/header.php:162 +#: application/views/interface_assets/header.php:164 #: application/views/kml/index.php:47 #: application/views/logbookadvanced/edit.php:7 #: application/views/logbookadvanced/index.php:145 @@ -214,12 +214,12 @@ msgid "Awards - WAJA" msgstr "" #: application/controllers/Awards.php:327 application/views/bands/index.php:51 -#: application/views/interface_assets/header.php:208 +#: application/views/interface_assets/header.php:210 msgid "JCC" msgstr "" #: application/controllers/Awards.php:375 application/views/bands/index.php:57 -#: application/views/interface_assets/header.php:168 +#: application/views/interface_assets/header.php:170 msgid "VUCC" msgstr "" @@ -261,7 +261,7 @@ msgstr "" #: application/controllers/Logbook.php:1278 #: application/views/awards/index.php:8 application/views/bands/index.php:55 #: application/views/dashboard/index.php:9 -#: application/views/interface_assets/header.php:176 +#: application/views/interface_assets/header.php:178 #: application/views/logbookadvanced/edit.php:17 #: application/views/logbookadvanced/index.php:259 #: application/views/logbookadvanced/useroptions.php:98 @@ -287,7 +287,7 @@ msgstr "" #: application/controllers/Logbook.php:1279 #: application/views/bands/index.php:60 #: application/views/dashboard/index.php:10 -#: application/views/interface_assets/header.php:170 +#: application/views/interface_assets/header.php:172 #: application/views/logbookadvanced/edit.php:19 #: application/views/logbookadvanced/index.php:279 #: application/views/logbookadvanced/useroptions.php:134 @@ -307,7 +307,7 @@ msgstr "" #: application/controllers/Logbook.php:1280 #: application/views/bands/index.php:52 #: application/views/dashboard/index.php:11 -#: application/views/interface_assets/header.php:180 +#: application/views/interface_assets/header.php:182 #: application/views/logbookadvanced/edit.php:13 #: application/views/logbookadvanced/index.php:263 #: application/views/logbookadvanced/index.php:595 @@ -334,7 +334,7 @@ msgid "Worked All States (WAS)" msgstr "" #: application/controllers/Awards.php:714 application/views/bands/index.php:53 -#: application/views/interface_assets/header.php:186 +#: application/views/interface_assets/header.php:188 msgid "RAC" msgstr "" @@ -348,7 +348,7 @@ msgstr "" #: application/controllers/Awards.php:858 #: application/controllers/Awards.php:872 -#: application/views/interface_assets/header.php:228 +#: application/views/interface_assets/header.php:230 msgid "US Counties" msgstr "" @@ -380,7 +380,7 @@ msgid "Fred Fish Memorial Award (FFMA)" msgstr "" #: application/controllers/Awards.php:1125 -#: application/views/interface_assets/header.php:166 +#: application/views/interface_assets/header.php:168 #: application/views/logbookadvanced/useroptions.php:138 msgid "SIG" msgstr "" @@ -395,7 +395,7 @@ msgid "ITU Zones" msgstr "" #: application/controllers/Backup.php:15 application/views/backup/main.php:14 -#: application/views/interface_assets/header.php:272 +#: application/views/interface_assets/header.php:274 msgid "Backup" msgstr "" @@ -409,7 +409,7 @@ msgstr "" #: application/controllers/Band.php:25 application/views/bands/index.php:28 #: application/views/bands/index.php:32 -#: application/views/interface_assets/header.php:371 +#: application/views/interface_assets/header.php:373 #: application/views/statistics/index.php:16 #: application/views/statistics/index.php:56 msgid "Bands" @@ -436,7 +436,7 @@ msgid "Export Cabrillo" msgstr "" #: application/controllers/Cfdexport.php:20 -#: application/views/interface_assets/header.php:388 +#: application/views/interface_assets/header.php:390 msgid "CFD Export" msgstr "" @@ -453,7 +453,7 @@ msgid "No user has configured Clublog." msgstr "" #: application/controllers/Contestcalendar.php:19 -#: application/views/interface_assets/header.php:245 +#: application/views/interface_assets/header.php:247 msgid "Contest Calendar" msgstr "" @@ -463,7 +463,7 @@ msgid "Contest Logging" msgstr "" #: application/controllers/Contesting.php:101 -#: application/views/interface_assets/header.php:266 +#: application/views/interface_assets/header.php:268 msgid "Contests" msgstr "" @@ -474,12 +474,12 @@ msgstr "" #: application/controllers/Continents.php:25 #: application/views/awards/dxcc/index.php:83 #: application/views/awards/iota/index.php:57 -#: application/views/interface_assets/header.php:152 +#: application/views/interface_assets/header.php:154 msgid "Continents" msgstr "" #: application/controllers/Cron.php:38 -#: application/views/interface_assets/header.php:276 +#: application/views/interface_assets/header.php:278 msgid "Cron Manager" msgstr "" @@ -488,7 +488,7 @@ msgid "Edit Cronjob" msgstr "" #: application/controllers/Csv.php:20 application/views/csv/index.php:3 -#: application/views/interface_assets/header.php:384 +#: application/views/interface_assets/header.php:386 msgid "SOTA CSV Export" msgstr "" @@ -539,7 +539,7 @@ msgstr "" #: application/controllers/Distances.php:17 #: application/views/distances/index.php:5 #: application/views/distances/index.php:8 -#: application/views/interface_assets/header.php:142 +#: application/views/interface_assets/header.php:144 msgid "Distances Worked" msgstr "" @@ -553,12 +553,12 @@ msgid "and band" msgstr "" #: application/controllers/Dxatlas.php:19 -#: application/views/interface_assets/header.php:382 +#: application/views/interface_assets/header.php:384 msgid "DX Atlas Gridsquare Export" msgstr "" #: application/controllers/Dxcalendar.php:10 -#: application/views/interface_assets/header.php:243 +#: application/views/interface_assets/header.php:245 msgid "DX Calendar" msgstr "" @@ -598,7 +598,7 @@ msgid "eQSL Card Image Download" msgstr "" #: application/controllers/Gridmap.php:10 -#: application/views/interface_assets/header.php:136 +#: application/views/interface_assets/header.php:138 msgid "Gridsquare Map" msgstr "" @@ -623,7 +623,7 @@ msgid "No QSOs found to upload." msgstr "" #: application/controllers/Kmlexport.php:24 -#: application/views/interface_assets/header.php:380 +#: application/views/interface_assets/header.php:382 #: application/views/kml/index.php:3 msgid "KML Export" msgstr "" @@ -1035,7 +1035,7 @@ msgstr "" #: application/controllers/Logbook.php:1277 #: application/views/awards/iota/index.php:169 #: application/views/bands/index.php:50 application/views/dashboard/index.php:8 -#: application/views/interface_assets/header.php:178 +#: application/views/interface_assets/header.php:180 #: application/views/logbookadvanced/edit.php:9 #: application/views/logbookadvanced/index.php:267 #: application/views/logbookadvanced/index.php:592 @@ -1305,7 +1305,7 @@ msgstr "" #: application/controllers/Lotw.php:54 application/controllers/Lotw.php:83 #: application/controllers/Lotw.php:125 application/views/adif/import.php:27 -#: application/views/interface_assets/header.php:415 +#: application/views/interface_assets/header.php:417 #: application/views/lotw/import.php:3 #: application/views/lotw_views/index.php:12 #: application/views/lotw_views/upload_cert.php:3 @@ -1334,7 +1334,7 @@ msgid "LoTW .TQ8 Not Sent" msgstr "" #: application/controllers/Mode.php:25 -#: application/views/interface_assets/header.php:264 +#: application/views/interface_assets/header.php:266 #: application/views/mode/index.php:15 msgid "Modes" msgstr "" @@ -1486,7 +1486,7 @@ msgid "Log Search & OQRS" msgstr "" #: application/controllers/Oqrs.php:104 -#: application/views/interface_assets/header.php:405 +#: application/views/interface_assets/header.php:407 msgid "OQRS Requests" msgstr "" @@ -1495,7 +1495,7 @@ msgid "QRB Calculator" msgstr "" #: application/controllers/Qrz.php:173 -#: application/views/interface_assets/header.php:418 +#: application/views/interface_assets/header.php:420 msgid "QRZ Logbook" msgstr "" @@ -1531,7 +1531,7 @@ msgid "Add QSO" msgstr "" #: application/controllers/Radio.php:18 -#: application/views/interface_assets/header.php:424 +#: application/views/interface_assets/header.php:426 msgid "Hardware Interfaces" msgstr "" @@ -1567,8 +1567,8 @@ msgstr "" #: application/controllers/Search.php:19 #: application/views/continents/index.php:49 -#: application/views/interface_assets/header.php:328 -#: application/views/interface_assets/header.php:335 +#: application/views/interface_assets/header.php:330 +#: application/views/interface_assets/header.php:337 #: application/views/logbookadvanced/index.php:511 #: application/views/oqrs/index.php:28 #: application/views/oqrs/showrequests.php:67 @@ -1632,8 +1632,8 @@ msgid "Duplicate Station Location:" msgstr "" #: application/controllers/Stationsetup.php:35 -#: application/views/interface_assets/header.php:369 -#: application/views/interface_assets/header.php:480 +#: application/views/interface_assets/header.php:371 +#: application/views/interface_assets/header.php:482 msgid "Station Setup" msgstr "" @@ -1697,7 +1697,7 @@ msgid "Set as Active Logbook" msgstr "" #: application/controllers/Stationsetup.php:263 -#: application/views/interface_assets/header.php:478 +#: application/views/interface_assets/header.php:480 #: application/views/stationsetup/stationsetup.php:46 #: application/views/view_log/index.php:4 msgid "Active Logbook" @@ -1834,8 +1834,14 @@ msgstr "" msgid "Custom Statistics" msgstr "" +#: application/controllers/Statistics.php:232 +#: application/views/interface_assets/header.php:136 +#: application/views/statistics/qsltable.php:5 +msgid "QSL Statistics" +msgstr "" + #: application/controllers/Themes.php:27 -#: application/views/interface_assets/header.php:270 +#: application/views/interface_assets/header.php:272 msgid "Themes" msgstr "" @@ -1848,13 +1854,13 @@ msgid "Edit Theme" msgstr "" #: application/controllers/Timeline.php:17 -#: application/views/interface_assets/header.php:146 +#: application/views/interface_assets/header.php:148 #: application/views/timeline/index.php:2 msgid "Timeline" msgstr "" #: application/controllers/Timeplotter.php:17 -#: application/views/interface_assets/header.php:150 +#: application/views/interface_assets/header.php:152 #: application/views/timeplotter/index.php:9 msgid "Timeplotter" msgstr "" @@ -1896,7 +1902,7 @@ msgid "Dxcc Prefixes:" msgstr "" #: application/controllers/User.php:12 -#: application/views/interface_assets/header.php:260 +#: application/views/interface_assets/header.php:262 msgid "User Accounts" msgstr "" @@ -1936,7 +1942,7 @@ msgid "Login failed. Try again." msgstr "" #: application/controllers/User.php:860 -#: application/views/interface_assets/header.php:348 +#: application/views/interface_assets/header.php:350 #: application/views/user/login.php:89 #: application/views/visitor/layout/header.php:88 msgid "Login" @@ -2018,7 +2024,7 @@ msgstr "" #: application/controllers/Webadif.php:90 #: application/controllers/Webadif.php:137 -#: application/views/interface_assets/header.php:419 +#: application/views/interface_assets/header.php:421 msgid "QO-100 Dx Club Upload" msgstr "" @@ -2881,7 +2887,7 @@ msgid "Save" msgstr "" #: application/views/api/help.php:14 -#: application/views/interface_assets/header.php:423 +#: application/views/interface_assets/header.php:425 msgid "API Keys" msgstr "" @@ -3089,6 +3095,8 @@ msgstr "" #: application/views/awards/was/index.php:177 #: application/views/dashboard/index.php:217 #: application/views/simplefle/index.php:27 +#: application/views/statistics/qsltable.php:54 +#: application/views/statistics/qsltable.php:109 #: application/views/statistics/qsotable.php:10 #: application/views/statistics/qsotable.php:23 #: application/views/statistics/satqsotable.php:10 @@ -3492,7 +3500,7 @@ msgid "Prefix" msgstr "" #: application/views/awards/ffma/index.php:8 -#: application/views/interface_assets/header.php:234 +#: application/views/interface_assets/header.php:236 msgid "Fred Fish Memorial Award" msgstr "" @@ -3585,7 +3593,7 @@ msgid "Canton" msgstr "" #: application/views/awards/index.php:9 application/views/bands/index.php:46 -#: application/views/interface_assets/header.php:160 +#: application/views/interface_assets/header.php:162 msgid "CQ" msgstr "" @@ -4161,12 +4169,12 @@ msgid "USA County" msgstr "" #: application/views/bands/index.php:58 -#: application/views/interface_assets/header.php:206 +#: application/views/interface_assets/header.php:208 msgid "WAJA" msgstr "" #: application/views/bands/index.php:59 -#: application/views/interface_assets/header.php:230 +#: application/views/interface_assets/header.php:232 msgid "WAS" msgstr "" @@ -4466,7 +4474,7 @@ msgstr "" #: application/views/contesting/add.php:44 #: application/views/contesting/edit.php:43 #: application/views/contesting/edit.php:46 -#: application/views/interface_assets/header.php:458 +#: application/views/interface_assets/header.php:460 #: application/views/mode/create.php:46 application/views/mode/create.php:48 #: application/views/mode/edit.php:57 application/views/mode/edit.php:60 #: application/views/mode/index.php:43 @@ -5152,7 +5160,7 @@ msgid "VUCC-Grids" msgstr "" #: application/views/dayswithqso/index.php:2 -#: application/views/interface_assets/header.php:144 +#: application/views/interface_assets/header.php:146 msgid "Days with QSOs" msgstr "" @@ -5631,7 +5639,7 @@ msgstr "" #: application/views/eqsl/download.php:17 application/views/eqsl/export.php:16 #: application/views/eqsl/import.php:15 application/views/eqsl/result.php:17 #: application/views/eqsl/tools.php:15 -#: application/views/interface_assets/header.php:241 +#: application/views/interface_assets/header.php:243 msgid "Tools" msgstr "" @@ -5926,7 +5934,7 @@ msgid "Propagation mode is not supported by LoTW. LoTW QSL fields disabled." msgstr "" #: application/views/interface_assets/footer.php:127 -#: application/views/interface_assets/header.php:426 +#: application/views/interface_assets/header.php:428 #: application/views/options/sidebar.php:11 msgid "Version Info" msgstr "" @@ -6000,85 +6008,85 @@ msgstr "" msgid "Analytics" msgstr "" -#: application/views/interface_assets/header.php:138 +#: application/views/interface_assets/header.php:140 msgid "Activated Gridsquares" msgstr "" -#: application/views/interface_assets/header.php:158 +#: application/views/interface_assets/header.php:160 msgid "International" msgstr "" -#: application/views/interface_assets/header.php:164 +#: application/views/interface_assets/header.php:166 msgid "ITU" msgstr "" -#: application/views/interface_assets/header.php:184 +#: application/views/interface_assets/header.php:186 msgid "Canada" msgstr "" -#: application/views/interface_assets/header.php:190 +#: application/views/interface_assets/header.php:192 msgid "Germany" msgstr "" -#: application/views/interface_assets/header.php:194 +#: application/views/interface_assets/header.php:196 msgid "DL Gridmaster" msgstr "" -#: application/views/interface_assets/header.php:198 +#: application/views/interface_assets/header.php:200 msgid "Great Britain" msgstr "" -#: application/views/interface_assets/header.php:200 +#: application/views/interface_assets/header.php:202 msgid "WAB" msgstr "" -#: application/views/interface_assets/header.php:204 +#: application/views/interface_assets/header.php:206 msgid "Japan" msgstr "" -#: application/views/interface_assets/header.php:210 +#: application/views/interface_assets/header.php:212 msgid "JA Gridmaster" msgstr "" -#: application/views/interface_assets/header.php:214 +#: application/views/interface_assets/header.php:216 msgid "Luxemburg" msgstr "" -#: application/views/interface_assets/header.php:216 +#: application/views/interface_assets/header.php:218 msgid "LX Gridmaster" msgstr "" -#: application/views/interface_assets/header.php:220 +#: application/views/interface_assets/header.php:222 msgid "Switzerland" msgstr "" -#: application/views/interface_assets/header.php:226 +#: application/views/interface_assets/header.php:228 msgid "USA" msgstr "" -#: application/views/interface_assets/header.php:232 +#: application/views/interface_assets/header.php:234 msgid "US Gridmaster" msgstr "" -#: application/views/interface_assets/header.php:249 +#: application/views/interface_assets/header.php:251 msgid "Bandmap" msgstr "" -#: application/views/interface_assets/header.php:251 +#: application/views/interface_assets/header.php:253 msgid "SAT Timers" msgstr "" -#: application/views/interface_assets/header.php:257 +#: application/views/interface_assets/header.php:259 #: application/views/station_profile/index.php:33 #: application/views/stationsetup/stationsetup.php:113 msgid "Admin" msgstr "" -#: application/views/interface_assets/header.php:262 +#: application/views/interface_assets/header.php:264 msgid "Global Options" msgstr "" -#: application/views/interface_assets/header.php:268 +#: application/views/interface_assets/header.php:270 #: application/views/notes/add.php:38 application/views/notes/edit.php:39 #: application/views/satellite/index.php:11 #: application/views/statistics/custom.php:20 @@ -6088,79 +6096,79 @@ msgstr "" msgid "Satellites" msgstr "" -#: application/views/interface_assets/header.php:274 +#: application/views/interface_assets/header.php:276 msgid "Update Country Files" msgstr "" -#: application/views/interface_assets/header.php:278 +#: application/views/interface_assets/header.php:280 msgid "Debug Information" msgstr "" -#: application/views/interface_assets/header.php:325 +#: application/views/interface_assets/header.php:327 msgid "Add/Search Callsign" msgstr "" -#: application/views/interface_assets/header.php:327 +#: application/views/interface_assets/header.php:329 msgid "Log" msgstr "" -#: application/views/interface_assets/header.php:334 +#: application/views/interface_assets/header.php:336 #: application/views/logbookadvanced/index.php:447 #: application/views/oqrs/index.php:27 application/views/user/edit.php:441 #: application/views/visitor/layout/header.php:97 msgid "Search Callsign" msgstr "" -#: application/views/interface_assets/header.php:363 +#: application/views/interface_assets/header.php:365 #: application/views/user/edit.php:49 msgid "Account" msgstr "" -#: application/views/interface_assets/header.php:378 +#: application/views/interface_assets/header.php:380 msgid "Other Export Options" msgstr "" -#: application/views/interface_assets/header.php:386 +#: application/views/interface_assets/header.php:388 msgid "Cabrillo Export" msgstr "" -#: application/views/interface_assets/header.php:410 +#: application/views/interface_assets/header.php:412 msgid "QSL Queue" msgstr "" -#: application/views/interface_assets/header.php:411 +#: application/views/interface_assets/header.php:413 msgid "Labels" msgstr "" -#: application/views/interface_assets/header.php:413 +#: application/views/interface_assets/header.php:415 msgid "Third-Party Services" msgstr "" -#: application/views/interface_assets/header.php:416 +#: application/views/interface_assets/header.php:418 msgid "eQSL Import / Export" msgstr "" -#: application/views/interface_assets/header.php:417 +#: application/views/interface_assets/header.php:419 msgid "HRDLog Logbook" msgstr "" -#: application/views/interface_assets/header.php:427 +#: application/views/interface_assets/header.php:429 msgid "Help" msgstr "" -#: application/views/interface_assets/header.php:428 +#: application/views/interface_assets/header.php:430 msgid "Forum" msgstr "" -#: application/views/interface_assets/header.php:430 +#: application/views/interface_assets/header.php:432 msgid "Logout" msgstr "" -#: application/views/interface_assets/header.php:438 +#: application/views/interface_assets/header.php:440 msgid "Select a Location" msgstr "" -#: application/views/interface_assets/header.php:517 +#: application/views/interface_assets/header.php:519 msgid "Extras" msgstr "" diff --git a/install/includes/gettext/lang_src/installer.pot b/install/includes/gettext/lang_src/installer.pot index 7e5e0a1cf..fc2b77faf 100644 --- a/install/includes/gettext/lang_src/installer.pot +++ b/install/includes/gettext/lang_src/installer.pot @@ -6,7 +6,7 @@ msgid "" msgstr "" "Report-Msgid-Bugs-To: translations@wavelog.org\n" -"POT-Creation-Date: 2024-07-30 12:21+0000\n" +"POT-Creation-Date: 2024-07-30 12:45+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n"