mirror
/
Cloudlog
kopia lustrzana https://github.com/magicbug/Cloudlog
1
0
Forkuj 0
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

Tag 2.6.6

pull/3001/head 2.6.6
Peter Goodhall 2024-03-06 15:26:21 +00:00 zatwierdzone przez GitHub
rodzic 7ba9cbf4f3 bac23f02cc
commit 9273c2c610
Nie znaleziono w bazie danych klucza dla tego podpisu
ID klucza GPG: B5690EEEBB952194
32 zmienionych plików z 2773 dodań i 2428 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

2
application/config/migration.php
Wyświetl plik

@ -22,7 +22,7 @@ $config['migration_enabled'] = TRUE;
|
*/
$config['migration_version'] = 172;
$config['migration_version'] = 173;
/*
|--------------------------------------------------------------------------

2
application/language/bulgarian/general_words_lang.php
Wyświetl plik

@ -124,6 +124,8 @@ $lang['gen_hamradio_suffix'] = "Suffix";
$lang['gen_hamradio_de'] = 'De';
$lang['gen_hamradio_dx'] = 'Dx';
$lang['gen_hamradio_mode'] = 'Режим';
$lang['gen_hamradio_ant_az'] = 'Antenna Azimuth';
$lang['gen_hamradio_ant_el'] = 'Antenna Elevation';
$lang['gen_hamradio_rst_sent'] = 'Sent';
$lang['gen_hamradio_rst_rcvd'] = 'Recv\'d';
$lang['gen_hamradio_band'] = 'Обхват';

2
application/language/chinese_simplified/general_words_lang.php
Wyświetl plik

@ -122,6 +122,8 @@ $lang['gen_hamradio_callsign'] = '呼号';
$lang['gen_hamradio_prefix'] = "前缀";
$lang['gen_hamradio_suffix'] = "后缀";
$lang['gen_hamradio_mode'] = '模式';
$lang['gen_hamradio_ant_az'] = 'Antenna Azimuth';
$lang['gen_hamradio_ant_el'] = 'Antenna Elevation';
$lang['gen_hamradio_de'] = '本台呼号(De)';
$lang['gen_hamradio_dx'] = '对方呼号(Dx)';
$lang['gen_hamradio_rst_sent'] = '发送 信号报告（RST）';

2
application/language/czech/general_words_lang.php
Wyświetl plik

@ -124,6 +124,8 @@ $lang['gen_hamradio_suffix'] = "Suffix";
$lang['gen_hamradio_de'] = 'De';
$lang['gen_hamradio_dx'] = 'Dx';
$lang['gen_hamradio_mode'] = 'Režim';
$lang['gen_hamradio_ant_az'] = 'Antenna Azimuth';
$lang['gen_hamradio_ant_el'] = 'Antenna Elevation';
$lang['gen_hamradio_rst_sent'] = 'Odesláno';
$lang['gen_hamradio_rst_rcvd'] = 'Přijato';
$lang['gen_hamradio_band'] = 'Pásmo';

2
application/language/dutch/general_words_lang.php
Wyświetl plik

@ -124,6 +124,8 @@ $lang['gen_hamradio_suffix'] = "Suffix";
$lang['gen_hamradio_de'] = 'De';
$lang['gen_hamradio_dx'] = 'Dx';
$lang['gen_hamradio_mode'] = 'Mode';
$lang['gen_hamradio_ant_az'] = 'Antenna Azimuth';
$lang['gen_hamradio_ant_el'] = 'Antenna Elevation';
$lang['gen_hamradio_rst_sent'] = 'Verzonden';
$lang['gen_hamradio_rst_rcvd'] = 'Ontvangen';
$lang['gen_hamradio_band'] = 'Band';

2
application/language/english/general_words_lang.php
Wyświetl plik

@ -124,6 +124,8 @@ $lang['gen_hamradio_suffix'] = "Suffix";
$lang['gen_hamradio_de'] = 'De';
$lang['gen_hamradio_dx'] = 'Dx';
$lang['gen_hamradio_mode'] = 'Mode';
$lang['gen_hamradio_ant_az'] = 'Antenna Azimuth';
$lang['gen_hamradio_ant_el'] = 'Antenna Elevation';
$lang['gen_hamradio_rst_sent'] = 'Sent';
$lang['gen_hamradio_rst_rcvd'] = 'Recv\'d';
$lang['gen_hamradio_band'] = 'Band';

2
application/language/finnish/general_words_lang.php
Wyświetl plik

@ -124,6 +124,8 @@ $lang['gen_hamradio_suffix'] = "Suffix";
$lang['gen_hamradio_de'] = 'De';
$lang['gen_hamradio_dx'] = 'Dx';
$lang['gen_hamradio_mode'] = 'Lähetelaji';
$lang['gen_hamradio_ant_az'] = 'Antenna Azimuth';
$lang['gen_hamradio_ant_el'] = 'Antenna Elevation';
$lang['gen_hamradio_rst_sent'] = 'Annettu raportti';
$lang['gen_hamradio_rst_rcvd'] = 'Saatu raportti';
$lang['gen_hamradio_band'] = 'Bandi';

2
application/language/french/general_words_lang.php
Wyświetl plik

@ -124,6 +124,8 @@ $lang['gen_hamradio_suffix'] = "Suffix";
$lang['gen_hamradio_de'] = "De";
$lang['gen_hamradio_dx'] = "Dx";
$lang['gen_hamradio_mode'] = "Mode";
$lang['gen_hamradio_ant_az'] = 'Antenna Azimuth';
$lang['gen_hamradio_ant_el'] = 'Antenna Elevation';
$lang['gen_hamradio_rst_sent'] = "Envoyé";
$lang['gen_hamradio_rst_rcvd'] = "Reçu";
$lang['gen_hamradio_band'] = "Bande";

2
application/language/german/general_words_lang.php
Wyświetl plik

@ -124,6 +124,8 @@ $lang['gen_hamradio_suffix'] = "Suffix";
$lang['gen_hamradio_de'] = 'De';
$lang['gen_hamradio_dx'] = 'Dx';
$lang['gen_hamradio_mode'] = 'Mode';
$lang['gen_hamradio_ant_az'] = 'Antennenazimut';
$lang['gen_hamradio_ant_el'] = 'Antennenelevation';
$lang['gen_hamradio_rst_sent'] = 'Gegeben';
$lang['gen_hamradio_rst_rcvd'] = 'Erhalten';
$lang['gen_hamradio_band'] = 'Band';

2
application/language/greek/general_words_lang.php
Wyświetl plik

@ -124,6 +124,8 @@ $lang['gen_hamradio_suffix'] = "Suffix";
$lang['gen_hamradio_de'] = 'De';
$lang['gen_hamradio_dx'] = 'Dx';
$lang['gen_hamradio_mode'] = 'Τρόπος';
$lang['gen_hamradio_ant_az'] = 'Antenna Azimuth';
$lang['gen_hamradio_ant_el'] = 'Antenna Elevation';
$lang['gen_hamradio_rst_sent'] = 'Απεσταλμένα';
$lang['gen_hamradio_rst_rcvd'] = 'Ελήφθη\'d';
$lang['gen_hamradio_band'] = 'Ζώνη';

2
application/language/italian/general_words_lang.php
Wyświetl plik

@ -124,6 +124,8 @@ $lang['gen_hamradio_suffix'] = "Suffix";
$lang['gen_hamradio_de'] = 'De';
$lang['gen_hamradio_dx'] = 'Dx';
$lang['gen_hamradio_mode'] = 'Modo';
$lang['gen_hamradio_ant_az'] = 'Antenna Azimuth';
$lang['gen_hamradio_ant_el'] = 'Antenna Elevation';
$lang['gen_hamradio_rst_sent'] = 'Inviato';
$lang['gen_hamradio_rst_rcvd'] = 'Ricevuto';
$lang['gen_hamradio_band'] = 'Banda';

2
application/language/polish/general_words_lang.php
Wyświetl plik

@ -124,6 +124,8 @@ $lang['gen_hamradio_suffix'] = "Suffix";
$lang['gen_hamradio_de'] = 'De';
$lang['gen_hamradio_dx'] = 'Dx';
$lang['gen_hamradio_mode'] = 'Modulacja';
$lang['gen_hamradio_ant_az'] = 'Antenna Azimuth';
$lang['gen_hamradio_ant_el'] = 'Antenna Elevation';
$lang['gen_hamradio_rst_sent'] = 'Wysłany';
$lang['gen_hamradio_rst_rcvd'] = 'Odebrany\'d';
$lang['gen_hamradio_band'] = 'Pasmo';

2
application/language/russian/general_words_lang.php
Wyświetl plik

@ -125,6 +125,8 @@ $lang['gen_hamradio_callsign'] = 'Позывной';
$lang['gen_hamradio_de'] = 'от';
$lang['gen_hamradio_dx'] = 'DX';
$lang['gen_hamradio_mode'] = 'Вид модуляции';
$lang['gen_hamradio_ant_az'] = 'Antenna Azimuth';
$lang['gen_hamradio_ant_el'] = 'Antenna Elevation';
$lang['gen_hamradio_rst_sent'] = 'Отправлено';
$lang['gen_hamradio_rst_rcvd'] = 'Получено';
$lang['gen_hamradio_bandgroup'] = "Bandgroup";

2
application/language/spanish/general_words_lang.php
Wyświetl plik

@ -125,6 +125,8 @@ $lang['gen_hamradio_suffix'] = "Sufijo";
$lang['gen_hamradio_de'] = 'De';
$lang['gen_hamradio_dx'] = 'Dx';
$lang['gen_hamradio_mode'] = 'Modo';
$lang['gen_hamradio_ant_az'] = 'Antenna Azimuth';
$lang['gen_hamradio_ant_el'] = 'Antenna Elevation';
$lang['gen_hamradio_rst_sent'] = 'Enviado';
$lang['gen_hamradio_rst_rcvd'] = 'Recibido';
$lang['gen_hamradio_band'] = 'Banda';

2
application/language/swedish/general_words_lang.php
Wyświetl plik

@ -125,6 +125,8 @@ $lang['gen_hamradio_callsign'] = 'Signal';
$lang['gen_hamradio_de'] = 'De';
$lang['gen_hamradio_dx'] = 'Dx';
$lang['gen_hamradio_mode'] = 'Mode';
$lang['gen_hamradio_ant_az'] = 'Antenna Azimuth';
$lang['gen_hamradio_ant_el'] = 'Antenna Elevation';
$lang['gen_hamradio_rst_sent'] = 'Skickat';
$lang['gen_hamradio_rst_rcvd'] = 'Mottagen\'d';
$lang['gen_hamradio_band'] = 'Band';

2
application/language/turkish/general_words_lang.php
Wyświetl plik

@ -124,6 +124,8 @@ $lang['gen_hamradio_suffix'] = "Suffix";
$lang['gen_hamradio_de'] = 'De';
$lang['gen_hamradio_dx'] = 'Dx';
$lang['gen_hamradio_mode'] = 'Mod';
$lang['gen_hamradio_ant_az'] = 'Antenna Azimuth';
$lang['gen_hamradio_ant_el'] = 'Antenna Elevation';
$lang['gen_hamradio_rst_sent'] = 'Gönderilen';
$lang['gen_hamradio_rst_rcvd'] = 'Alınan';
$lang['gen_hamradio_band'] = 'Bant';

56
application/libraries/AdifHelper.php
Wyświetl plik

@ -2,7 +2,14 @@
class AdifHelper {
public function getAdifLine($qso) {
/**
* Generates an ADIF line for a QSO record.
*
* @param object $qso The QSO record.
* @param bool $satellite_remap Flag indicating whether to remap satellite names.
* @return string The ADIF line.
*/
public function getAdifLine($qso, $satellite_remap = false) {
$normalFields = array(
'ADDRESS',
'AGE',
@ -80,7 +87,6 @@ class AdifHelper {
'RST_SENT',
'RX_PWR',
'SAT_MODE',
'SAT_NAME',
'SFI',
'SILENT_KEY',
'SKCC',
@ -183,11 +189,23 @@ class AdifHelper {
$line .= $this->getAdifFieldLine("MY_GRIDSQUARE", $qso->station_gridsquare);
}
if($qso->COL_SAT_NAME) {
if($satellite_remap === true) {
$satname = $this->lotw_satellite_map($qso->COL_SAT_NAME);
if($satname) {
$line .= $this->getAdifFieldLine("SAT_NAME", $satname);
} else {
$line .= $this->getAdifFieldLine("SAT_NAME", $qso->COL_SAT_NAME);
}
} else {
$line .= $this->getAdifFieldLine("SAT_NAME", $qso->COL_SAT_NAME);
}
}
$line .= $this->getAdifFieldLine("MY_IOTA", $qso->station_iota);
$line .= $this->getAdifFieldLine("MY_SOTA_REF", $qso->station_sota);
$line .= $this->getAdifFieldLine("MY_POTA_REF", $qso->station_pota);
$line .= $this->getAdifFieldLine("MY_CQ_ZONE", $qso->station_cq);
@ -258,4 +276,36 @@ class AdifHelper {
return "";
}
}
/*
| Function: lotw_satellite_map
| Requires: OSCAR Satellite name $satname
|
| Outputs if LoTW uses a different satellite name
|
*/
function lotw_satellite_map($satname) {
$arr = array(
"ARISS" => "ISS",
"UKUBE1" => "UKUBE-1",
"KEDR" => "ARISSAT-1",
"TO-108" => "CAS-6",
"TAURUS" => "TAURUS-1",
"AISAT1" => "AISAT-1",
'UVSQ' => "UVSQ-SAT",
'CAS-3H' => "LILACSAT-2",
'IO-117' => "GREENCUBE",
"TEVEL1" => "TEVEL-1",
"TEVEL2" => "TEVEL-2",
"TEVEL3" => "TEVEL-3",
"TEVEL4" => "TEVEL-4",
"TEVEL5" => "TEVEL-5",
"TEVEL6" => "TEVEL-6",
"TEVEL7" => "TEVEL-7",
"TEVEL8" => "TEVEL-8",
"INSPR7" => "INSPIRE-SAT 7",
);
return array_search(strtoupper($satname),$arr,true);
}
}

30
application/migrations/173_tag_2_6_6.php 100644
Wyświetl plik

@ -0,0 +1,30 @@
<?php
defined('BASEPATH') OR exit('No direct script access allowed');
/*
* Tag Cloudlog as 2.6.6
*/
class Migration_tag_2_6_6 extends CI_Migration {
public function up()
{
// Tag Cloudlog 2.6.3
$this->db->where('option_name', 'version');
$this->db->update('options', array('option_value' => '2.6.6'));
// Trigger Version Info Dialog
$this->db->where('option_type', 'version_dialog');
$this->db->where('option_name', 'confirmed');
$this->db->update('user_options', array('option_value' => 'false'));
}
public function down()
{
$this->db->where('option_name', 'version');
$this->db->update('options', array('option_value' => '2.6.5'));
}
}

18
application/models/Logbook_model.php
Wyświetl plik

@ -2984,7 +2984,8 @@ class Logbook_model extends CI_Model
}
/* Used to check if the qso is already in the database */
function import_check($datetime, $callsign, $band, $mode, $station_callsign, $station_id = null) {
function import_check($datetime, $callsign, $band, $mode, $station_callsign, $station_id = null)
{
$mode = $this->get_main_mode_from_mode($mode);
$this->db->select('COL_PRIMARY_KEY, COL_TIME_ON, COL_CALL, COL_BAND');
@ -3412,8 +3413,15 @@ class Logbook_model extends CI_Model
// Check if RX_PWR is "K" which N1MM+ uses to indicate 1000W
if ($record['rx_pwr'] == "K") {
$rx_pwr = 1000;
} elseif ($record['rx_pwr'] == "KW") {
$rx_pwr = 1000;
} else {
$rx_pwr = filter_var($record['rx_pwr'], FILTER_VALIDATE_FLOAT);
if (isset($record['rx_pwr']) && is_numeric($record['rx_pwr'])) {
$rx_pwr = $record['rx_pwr'];
} else {
$rx_pwr = null;
$my_error .= "Error QSO: Date: " . $time_on . " Callsign: " . $record['call'] . " RX_PWR (".$record['rx_pwr'].") is not a number<br>";
}
}
} else {
$rx_pwr = NULL;
@ -3432,13 +3440,15 @@ class Logbook_model extends CI_Model
}
if (isset($record['ant_az'])) {
$input_ant_az = filter_var($record['ant_az'], FILTER_SANITIZE_NUMBER_INT);
$input_ant_az = filter_var($record['ant_az'], FILTER_VALIDATE_FLOAT);
$input_ant_az = fmod($input_ant_az, 360);
} else {
$input_ant_az = NULL;
}
if (isset($record['ant_el'])) {
$input_ant_el = filter_var($record['ant_el'], FILTER_SANITIZE_NUMBER_INT);
$input_ant_el = filter_var($record['ant_el'], FILTER_VALIDATE_FLOAT);
$input_ant_el = fmod($input_ant_el, 90);
} else {
$input_ant_el = NULL;
}

2
application/views/adif/data/clublog.php
Wyświetl plik

@ -9,5 +9,5 @@ $CI =& get_instance();
$CI->load->library('AdifHelper');
foreach ($qsos->result() as $qso) {
echo $CI->adifhelper->getAdifLine($qso);
echo $CI->adifhelper->getAdifLine($qso, $satellite_remap = true);
}

10
application/views/components/upcoming_dxccs.php
Wyświetl plik

@ -1,15 +1,15 @@
<table class="table table-striped border-top">
<table id="upcoming_dxccs_component" class="table table-striped border-top">
<tr class="titles">
<td colspan="3"><i class="fas fa-chart-bar"></i> DXPeditions (This Week)</td>
</tr>
<?php
foreach ($thisWeekRecords as $record) {
$color = $record['workedBefore'] == 1 ? '#ddffdd' : '#ffdddd';
$name = $record['workedBefore'] == 1 ? 'worked_before' : 'not_worked_before';
echo '<tr>';
echo '<td style="background-color: ' . $color . ';" width="33%">' . $record['daysLeft'] . '</td>'; // Date
echo '<td style="background-color: ' . $color . ';" width="33%">' . '<a href="#" data-bs-toggle="tooltip" data-bs-title="'.$record['6'].'">'.$record['callsign'] . '</a>'. '</td>'; // Callsign
echo '<td style="background-color: ' . $color . ';" width="33%">' . $record['2'] . '</td>'; // Country
echo '<td id="' . $name . '">' . $record['daysLeft'] . '</td>'; // Date
echo '<td id="' . $name . '">' . '<a target="_blank" href="https://dxheat.com/db/'.$record['callsign'].'" data-bs-toggle="tooltip" data-bs-title="'.$record['6'].'">'.$record['callsign'] . '</a>'. '</td>'; // Callsign
echo '<td id="' . $name . '">' . $record['2'] . '</td>'; // Country
echo '</tr>';
}
?>

327
application/views/interface_assets/footer.php
Wyświetl plik

@ -94,7 +94,6 @@ if($this->session->userdata('user_id') != null) {
type: 'POST',
});
});
</script>
<?php } ?>
@ -164,6 +163,7 @@ if($this->session->userdata('user_id') != null) {
<script src="<?php echo base_url(); ?>assets/js/sections/station_locations.js"></script>
<script>
var position;
function getLocation() {
if (navigator.geolocation) {
navigator.geolocation.getCurrentPosition(showPosition);
@ -187,8 +187,7 @@ if($this->session->userdata('user_id') != null) {
<script type="text/javascript">
function copyURL(url) {
var urlField = $('#baseUrl');
navigator.clipboard.writeText(url).then(function() {
});
navigator.clipboard.writeText(url).then(function() {});
urlField.addClass('flash-copy')
.delay('1000').queue(function() {
urlField.removeClass('flash-copy').dequeue();
@ -196,7 +195,13 @@ function copyURL(url) {
}
$(function() {
$('[data-bs-toggle="tooltip"]').tooltip({'delay': { show: 500, hide: 0 }, 'placement': 'right'});
$('[data-bs-toggle="tooltip"]').tooltip({
'delay': {
show: 500,
hide: 0
},
'placement': 'right'
});
});
</script>
<?php } ?>
@ -205,8 +210,7 @@ $(function () {
<script type="text/javascript">
function copyApiKey(apiKey) {
var apiKeyField = $('#' + apiKey);
navigator.clipboard.writeText(apiKey).then(function() {
});
navigator.clipboard.writeText(apiKey).then(function() {});
apiKeyField.addClass('flash-copy')
.delay('1000').queue(function() {
apiKeyField.removeClass('flash-copy').dequeue();
@ -215,8 +219,7 @@ function copyApiKey(apiKey) {
function copyApiUrl() {
var apiUrlField = $('#apiUrl');
navigator.clipboard.writeText("<?php echo base_url(); ?>").then(function() {
});
navigator.clipboard.writeText("<?php echo base_url(); ?>").then(function() {});
apiUrlField.addClass('flash-copy')
.delay('1000').queue(function() {
apiUrlField.removeClass('flash-copy').dequeue();
@ -224,7 +227,13 @@ function copyApiUrl() {
}
$(function() {
$('[data-bs-toggle="tooltip"]').tooltip({'delay': { show: 500, hide: 0 }, 'placement': 'right'});
$('[data-bs-toggle="tooltip"]').tooltip({
'delay': {
show: 500,
hide: 0
},
'placement': 'right'
});
});
</script>
<?php } ?>
@ -660,7 +669,11 @@ function newpath(latlng1, latlng2, locator1, locator2) {
var osmUrl = '<?php echo $this->optionslib->get_option('option_map_tile_server'); ?>';
var osmAttrib = 'Map data © <a href="https://openstreetmap.org">OpenStreetMap</a> contributors';
var osm = new L.TileLayer(osmUrl, {minZoom: 1, maxZoom: 12, attribution: osmAttrib});
var osm = new L.TileLayer(osmUrl, {
minZoom: 1,
maxZoom: 12,
attribution: osmAttrib
});
var redIcon = L.icon({
iconUrl: icon_dot_url,
@ -669,9 +682,15 @@ function newpath(latlng1, latlng2, locator1, locator2) {
map.addLayer(osm);
var marker = L.marker([latlng1[0], latlng1[1]], {closeOnClick: false, autoClose: false}).addTo(map).bindPopup(locator1);
var marker = L.marker([latlng1[0], latlng1[1]], {
closeOnClick: false,
autoClose: false
}).addTo(map).bindPopup(locator1);
var marker2 = L.marker([latlng2[0], latlng2[1]], {closeOnClick: false, autoClose: false}).addTo(map).bindPopup(locator2);
var marker2 = L.marker([latlng2[0], latlng2[1]], {
closeOnClick: false,
autoClose: false
}).addTo(map).bindPopup(locator2);
const multiplelines = [];
multiplelines.push(
@ -714,11 +733,14 @@ function showActivatorsMap(call, count, grids) {
var osmUrl = '<?php echo $this->optionslib->get_option('option_map_tile_server'); ?>';
var osmAttrib = 'Map data © <a href="https://openstreetmap.org">OpenStreetMap</a> contributors';
var osm = new L.TileLayer(osmUrl, {minZoom: 1, maxZoom: 12, attribution: osmAttrib});
var osm = new L.TileLayer(osmUrl, {
minZoom: 1,
maxZoom: 12,
attribution: osmAttrib
});
map.addLayer(osm);
}
</script>
<?php if ($this->uri->segment(1) == "map" && $this->uri->segment(2) == "custom") { ?>
@ -746,7 +768,9 @@ function showActivatorsMap(call, count, grids) {
<?php } else { ?>
var grid = "No";
<?php } ?>
initmap(grid, 'custommap', {'initmap_only':true});
initmap(grid, 'custommap', {
'initmap_only': true
});
// Check and change date if to < from //
$('.custom-map-QSOs input[name="to"]').off('change').on('change', function() {
if ($('.custom-map-QSOs input[name="to"]').val().replaceAll('-', '') < $('.custom-map-QSOs input[name="from"]').val().replaceAll('-', '')) {
@ -760,9 +784,17 @@ function showActivatorsMap(call, count, grids) {
});
// Form "submit" //
$('.custom-map-QSOs .btn_submit_map_custom').off('click').on('click', function() {
var customdata = {'dataPost':{'date_from': $('.custom-map-QSOs input[name="from"]').val(), 'date_to': $('.custom-map-QSOs input[name="to"]').val(),
'band': $('.custom-map-QSOs select[name="band"]').val(), 'mode': $('.custom-map-QSOs select[name="mode"]').val(),
'prop_mode': $('.custom-map-QSOs select[name="prop_mode"]').val(), 'isCustom':true }, 'map_id':'#custommap'};
var customdata = {
'dataPost': {
'date_from': $('.custom-map-QSOs input[name="from"]').val(),
'date_to': $('.custom-map-QSOs input[name="to"]').val(),
'band': $('.custom-map-QSOs select[name="band"]').val(),
'mode': $('.custom-map-QSOs select[name="mode"]').val(),
'prop_mode': $('.custom-map-QSOs select[name="prop_mode"]').val(),
'isCustom': true
},
'map_id': '#custommap'
};
initplot(qso_loc, customdata);
})
@ -797,7 +829,11 @@ function showActivatorsMap(call, count, grids) {
<?php } else { ?>
var grid = "No";
<?php } ?>
initmap(grid,'map',{'dataPost':{'nb_qso':'18'}});
initmap(grid, 'map', {
'dataPost': {
'nb_qso': '18'
}
});
});
</script>
@ -973,8 +1009,12 @@ $($('#callsign')).on('keypress',function(e) {
<?php } else { ?>
var grid = "No";
<?php } ?>
initmap(grid,'map',{'dataPost':{'nb_qso':'25','offset':'<?php echo $this->uri->segment(3); ?>'}});
initmap(grid, 'map', {
'dataPost': {
'nb_qso': '25',
'offset': '<?php echo $this->uri->segment(3); ?>'
}
});
</script>
<?php } ?>
@ -990,7 +1030,11 @@ $($('#callsign')).on('keypress',function(e) {
var dxcluster_provider = '<?php echo base_url(); ?>index.php/dxcluster';
$(document).ready(function() {
$("#check_cluster").on("click", function() {
$.ajax({ url: dxcluster_provider+"/qrg_lookup/"+$("#frequency").val()/1000, cache: false, dataType: "json" }).done(
$.ajax({
url: dxcluster_provider + "/qrg_lookup/" + $("#frequency").val() / 1000,
cache: false,
dataType: "json"
}).done(
function(dxspot) {
reset_fields();
$("#callsign").val(dxspot.spotted);
@ -1042,8 +1086,7 @@ $($('#callsign')).on('keypress',function(e) {
pos = result;
}
},
error: function() {
},
error: function() {},
});
L.tileLayer('<?php echo $this->optionslib->get_option('option_map_tile_server'); ?>', {
@ -1051,11 +1094,9 @@ $($('#callsign')).on('keypress',function(e) {
attribution: '<?php echo $this->optionslib->get_option('option_map_tile_server_copyright'); ?>',
id: 'mapbox.streets'
}).addTo(mymap);
</script>
<script type="text/javascript">
var manual = <?php echo $_GET['manual']; ?>;
$(document).ready(function() {
@ -1149,6 +1190,10 @@ $($('#callsign')).on('keypress',function(e) {
}
$('#callsign').val("");
$("#callsign").focus();
updateFromCAT();
if (document.querySelector('#radio').value != '0') {
updateFromCAT();
}
}
});
});
@ -1160,7 +1205,9 @@ $($('#callsign')).on('keypress',function(e) {
$.ajax({
url: base_url + 'index.php/qso/get_sota_info',
type: 'post',
data: {'sota': sota},
data: {
'sota': sota
},
success: function(res) {
$('#qth').val(res.name);
$('#locator').val(res.locator);
@ -1181,7 +1228,9 @@ $($('#callsign')).on('keypress',function(e) {
$.ajax({
url: base_url + 'index.php/qso/get_wwff_info',
type: 'post',
data: {'wwff': wwff},
data: {
'wwff': wwff
},
success: function(res) {
$('#qth').val(res.name);
$('#locator').val(res.locator);
@ -1202,7 +1251,9 @@ $($('#callsign')).on('keypress',function(e) {
$.ajax({
url: base_url + 'index.php/qso/get_pota_info',
type: 'post',
data: {'pota': pota},
data: {
'pota': pota
},
success: function(res) {
$('#qth').val(res.name);
$('#locator').val(res.grid6);
@ -1221,7 +1272,9 @@ $($('#callsign')).on('keypress',function(e) {
$.ajax({
url: base_url + 'index.php/qso/get_station_power',
type: 'post',
data: {'stationProfile': stationProfile},
data: {
'stationProfile': stationProfile
},
success: function(res) {
$('#transmit_power').val(res.station_power);
},
@ -1287,7 +1340,8 @@ $($('#callsign')).on('keypress',function(e) {
ydiv = ydiv_arr[yk];
yres = ycalc[yi] / ydiv;
ycalc[yi] = yres;
if (ycalc[yi] > 0) ylp = Math.floor(yres); else ylp = Math.ceil(yres);
if (ycalc[yi] > 0) ylp = Math.floor(yres);
else ylp = Math.ceil(yres);
ycalc[yi] = (ycalc[yi] - ylp) * ydiv;
yn[2 * yk + yi] = ylp;
}
@ -1302,7 +1356,6 @@ $($('#callsign')).on('keypress',function(e) {
return qthloc;
}
<?php } ?>
</script>
<?php } ?>
@ -1310,7 +1363,6 @@ $($('#callsign')).on('keypress',function(e) {
<script type="text/javascript" src="<?php echo base_url(); ?>assets/js/moment.min.js"></script>
<script type="text/javascript" src="<?php echo base_url(); ?>assets/js/datetime-moment.js"></script>
<script>
$('#notice-alerts').delay(1000).fadeOut(5000);
function setRst(mode) {
@ -1342,7 +1394,6 @@ $($('#callsign')).on('keypress',function(e) {
var utc = localTime + (now.getTimezoneOffset() * 60000);
$(el).attr('value', ("0" + now.getUTCDate()).slice(-2) + '-' + ("0" + (now.getUTCMonth() + 1)).slice(-2) + '-' + now.getUTCFullYear());
}
</script>
<script>
@ -1361,7 +1412,9 @@ $($('#callsign')).on('keypress',function(e) {
if (ui.data('catValue') != cat) {
ui.val(cat);
ui.data('catValue', cat);
if (typeof callback_on_update === 'function') { callback_on_update(cat); }
if (typeof callback_on_update === 'function') {
callback_on_update(cat);
}
}
}
@ -1390,9 +1443,15 @@ $($('#callsign')).on('keypress',function(e) {
if ($('.radio_login_error').length != 0) {
$(".radio_login_error").remove();
}
cat2UI($('#frequency'),data.frequency,false,true,function(d){$("#band").val(frequencyToBand(d))});
cat2UI($('#frequency_rx'),data.frequency_rx,false,true,function(d){$("#band_rx").val(frequencyToBand(d))});
cat2UI($('.mode'),data.mode,false,false,function(d){setRst($(".mode").val())});
cat2UI($('#frequency'), data.frequency, false, true, function(d) {
$("#band").val(frequencyToBand(d))
});
cat2UI($('#frequency_rx'), data.frequency_rx, false, true, function(d) {
$("#band_rx").val(frequencyToBand(d))
});
cat2UI($('.mode'), data.mode, false, false, function(d) {
setRst($(".mode").val())
});
cat2UI($('#sat_name'), data.satname, false, false);
cat2UI($('#sat_mode'), data.satmode, false, false);
cat2UI($('#transmit_power'), data.power, false, false);
@ -1427,7 +1486,9 @@ $($('#callsign')).on('keypress',function(e) {
if (data.frequency_rx != null && data.frequency_rx != 0) {
ptext = ptext + '<span style="margin-left:10px"></span><b>RX:</b> ' + (Math.round(parseInt(data.frequency_rx) / 1000) / 1000).toFixed(3) + ' MHz';
}
if( ptext != '') { text = text + '<span style="margin-left:10px"></span>(' + ptext + ')';}
if (ptext != '') {
text = text + '<span style="margin-left:10px"></span>(' + ptext + ')';
}
if (!$('#radio_cat_state').length) {
$('#radio_status').prepend('<div aria-hidden="true"><div id="radio_cat_state" class="alert alert-success radio_cat_state" role="alert">' + text + '</div></div>');
} else {
@ -1463,7 +1524,6 @@ $($('#callsign')).on('keypress',function(e) {
<?php if ($this->uri->segment(1) == "logbook" && $this->uri->segment(2) == "view") { ?>
<script>
var mymap = L.map('map').setView([lat, long], 5);
L.tileLayer('<?php echo $this->optionslib->get_option('option_map_tile_server'); ?>', {
@ -1487,11 +1547,12 @@ $($('#callsign')).on('keypress',function(e) {
iconSize: [18, 18], // size of the icon
});
L.marker([lat,long], {icon: redIcon}).addTo(mymap)
L.marker([lat, long], {
icon: redIcon
}).addTo(mymap)
.bindPopup(callsign);
mymap.on('click', onMapClick);
</script>
<?php } ?>
@ -1500,9 +1561,12 @@ $($('#callsign')).on('keypress',function(e) {
$(document).ready(function() {
$('#btn_update_dxcc').bind('click', function() {
$('#dxcc_update_status').show();
$.ajax({url:"update/dxcc"});
$.ajax({
url: "update/dxcc"
});
setTimeout(update_stats, 5000);
});
function update_stats() {
$('#dxcc_update_status').load('<?php echo base_url() ?>updates/status.html', function(val) {
$('#dxcc_update_staus').html(val);
@ -1520,11 +1584,12 @@ $(document).ready(function(){
<?php } ?>
<?php if ($this->uri->segment(1) == "gridsquares" && !empty($this->uri->segment(2))) { ?>
<script>var gridsquaremap = true;</script>
<script>
var gridsquaremap = true;
</script>
<script type="text/javascript" src="<?php echo base_url(); ?>assets/js/leaflet/L.MaidenheadColoured.js"></script>
<script>
var layer = L.tileLayer('<?php echo $this->optionslib->get_option('option_map_tile_server'); ?>', {
maxZoom: 18,
attribution: '<?php echo $this->optionslib->get_option('option_map_tile_server_copyright'); ?>',
@ -1629,7 +1694,9 @@ $(document).ready(function(){
if (count > 0) {
$('#square_number').text(loc_4char);
$('#exampleModal').modal('show');
$('[data-bs-toggle="tooltip"]').tooltip({ boundary: 'window' });
$('[data-bs-toggle="tooltip"]').tooltip({
boundary: 'window'
});
}
$('.table-responsive .dropdown-toggle').off('mouseenter').on('mouseenter', function() {
showQsoActionsMenu($(this).closest('.dropdown'));
@ -1667,7 +1734,6 @@ $(document).ready(function(){
});
});
<?php } ?>
</script>
<?php } ?>
@ -1766,7 +1832,9 @@ $(document).ready(function(){
if (count > 0) {
$('#square_number').text(loc_4char);
$('#exampleModal').modal('show');
$('[data-bs-toggle="tooltip"]').tooltip({ boundary: 'window' });
$('[data-bs-toggle="tooltip"]').tooltip({
boundary: 'window'
});
}
$('.table-responsive .dropdown-toggle').off('mouseenter').on('mouseenter', function() {
showQsoActionsMenu($(this).closest('.dropdown'));
@ -1806,7 +1874,6 @@ $(document).ready(function(){
});
});
<?php } ?>
</script>
<?php } ?>
@ -1874,7 +1941,9 @@ $(document).ready(function(){
iconSize: [18, 18], // size of the icon
});
L.marker([lat,long], {icon: redIcon}).addTo(mymap)
L.marker([lat, long], {
icon: redIcon
}).addTo(mymap)
.bindPopup(callsign);
},
@ -1994,7 +2063,6 @@ $(document).ready(function(){
<?php if ($this->uri->segment(2) == "iota") { ?>
<script>
$('.tableiota').DataTable({
"pageLength": 25,
responsive: false,
@ -2115,7 +2183,6 @@ $(document).ready(function(){
<?php } ?>
<script>
function selectize_usa_county() {
var baseURL = "<?php echo base_url(); ?>";
$('#stationCntyInputEdit').selectize({
@ -2165,7 +2232,8 @@ $(document).ready(function(){
success: function(dataofconfirm) {
$(".edit-dialog").modal('hide');
$(".qso-dialog").modal('hide');
<?php if ($this->uri->segment(1) != "search" && $this->uri->segment(2) != "filter" && $this->uri->segment(1) != "qso" && $this->uri->segment(1) != "logbookadvanced") { ?>location.reload();<?php } ?>
<?php if ($this->uri->segment(1) != "search" && $this->uri->segment(2) != "filter" && $this->uri->segment(1) != "qso" && $this->uri->segment(1) != "logbookadvanced") { ?>location.reload();
<?php } ?>
},
error: function(xhr, status, error) {
console.log(xhr.responseText);
@ -2202,7 +2270,8 @@ $(document).ready(function(){
$.ajax({
url: baseURL + 'index.php/timeline/details',
type: 'post',
data: {'Querystring': querystring,
data: {
'Querystring': querystring,
'Band': band,
'Mode': mode,
'Type': type
@ -2257,10 +2326,8 @@ $(document).ready(function(){
}
$(document).ready(function() {
$('#band').change(function()
{
if($(this).val() == "SAT")
{
$('#band').change(function() {
if ($(this).val() == "SAT") {
$('#leogeo').show();
} else {
$('#leogeo').hide();
@ -2270,12 +2337,14 @@ $(document).ready(function(){
$('#leogeo').hide();
<?php } ?>
});
function displayActivatorsContacts(call, band, leogeo) {
var baseURL = "<?php echo base_url(); ?>";
$.ajax({
url: baseURL + 'index.php/activators/details',
type: 'post',
data: {'Callsign': call,
data: {
'Callsign': call,
'Band': band,
'LeoGeo': leogeo
},
@ -2334,15 +2403,33 @@ $(document).ready(function(){
}
switch ($custom_date_format) {
case 'd/m/y': $usethisformat = 'D/MM/YY';break;
case 'd/m/Y': $usethisformat = 'D/MM/YYYY';break;
case 'm/d/y': $usethisformat = 'MM/D/YY';break;
case 'm/d/Y': $usethisformat = 'MM/D/YYYY';break;
case 'd.m.Y': $usethisformat = 'D.MM.YYYY';break;
case 'y/m/d': $usethisformat = 'YY/MM/D';break;
case 'Y-m-d': $usethisformat = 'YYYY-MM-D';break;
case 'M d, Y': $usethisformat = 'MMM D, YYYY';break;
case 'M d, y': $usethisformat = 'MMM D, YY';break;
case 'd/m/y':
$usethisformat = 'D/MM/YY';
break;
case 'd/m/Y':
$usethisformat = 'D/MM/YYYY';
break;
case 'm/d/y':
$usethisformat = 'MM/D/YY';
break;
case 'm/d/Y':
$usethisformat = 'MM/D/YYYY';
break;
case 'd.m.Y':
$usethisformat = 'D.MM.YYYY';
break;
case 'y/m/d':
$usethisformat = 'YY/MM/D';
break;
case 'Y-m-d':
$usethisformat = 'YYYY-MM-D';
break;
case 'M d, Y':
$usethisformat = 'MMM D, YYYY';
break;
case 'M d, y':
$usethisformat = 'MMM D, YY';
break;
}
?>
@ -2360,8 +2447,7 @@ $(document).ready(function(){
$('.qsltable').DataTable({
<?php } else if ($this->uri->segment(1) == "eqsl") { ?>
$('.eqsltable').DataTable({
<?php } ?>
"pageLength": 25,
<?php } ?> "pageLength": 25,
responsive: false,
ordering: true,
"scrollY": "500px",
@ -2373,18 +2459,15 @@ $(document).ready(function(){
},
"order": [2, 'desc'],
dom: 'Bfrtip',
buttons: [
{
buttons: [{
extend: 'clear',
text: 'Clear'
}
]
}]
});
// change color of csv-button if dark mode is chosen
if (isDarkModeTheme()) {
$('[class*="buttons"]').css("color", "white");
}
</script>
<?php } ?>
@ -2429,7 +2512,8 @@ function deleteQsl(id) {
$.ajax({
url: baseURL + 'index.php/qsl/delete',
type: 'post',
data: {'id': id
data: {
'id': id
},
success: function(data) {
$("#" + id).parent("tr:first").remove(); // removes qsl from table
@ -2602,6 +2686,7 @@ function viewEqsl(picture, callsign) {
}
});
}
function uploadQsl() {
var baseURL = "<?php echo base_url(); ?>";
var formdata = new FormData(document.getElementById("fileinfo"));
@ -2624,8 +2709,7 @@ function viewEqsl(picture, callsign) {
$(".carousel-indicators").append('<li data-bs-target="#carouselExampleIndicators" data-bs-slide-to="' + quantity + '"></li>');
$(".carousel-inner").append('<center><div class="carousel-item carouselimageid_' + data.status.front.insertid + '"><img class="img-fluid w-qsl" src="' + baseURL + '/assets/qslcard/' + data.status.front.filename + '" alt="QSL picture #' + (quantity + 1) + '"></div></center>');
$("#qslcardfront").val(null);
}
else {
} else {
$("#qslupload").prepend('<table style="width:100%" class="qsltable table table-sm table-bordered table-hover table-striped table-condensed">' +
'<thead>' +
'<tr>' +
@ -2663,8 +2747,7 @@ function viewEqsl(picture, callsign) {
$(".carousel-indicators").append('<li data-bs-target="#carouselExampleIndicators" data-bs-slide-to="' + quantity + '"></li>');
$(".carousel-inner").append('<center><div class="carousel-item carouselimageid_' + data.status.back.insertid + '"><img class="img-fluid w-qsl" src="' + baseURL + '/assets/qslcard/' + data.status.back.filename + '" alt="QSL picture #' + (quantity + 1) + '"></div></center>');
$("#qslcardback").val(null);
}
else {
} else {
$("#qslupload").prepend('<table style="width:100%" class="qsltable table table-sm table-bordered table-hover table-striped table-condensed">' +
'<thead>' +
'<tr>' +
@ -2695,7 +2778,6 @@ function viewEqsl(picture, callsign) {
}
</script>
<script>
function addQsosToQsl(filename) {
var title = 'Add additional QSOs to a QSL Card';
@ -2703,7 +2785,9 @@ function viewEqsl(picture, callsign) {
$.ajax({
url: baseURL + 'index.php/qsl/loadSearchForm',
type: 'post',
data: {'filename': filename},
data: {
'filename': filename
},
success: function(html) {
BootstrapDialog.show({
title: title,
@ -2729,7 +2813,10 @@ function viewEqsl(picture, callsign) {
$.ajax({
url: baseURL + 'index.php/qsl/addQsoToQsl',
type: 'post',
data: {'filename': filename, 'qsoid': qsoid},
data: {
'filename': filename,
'qsoid': qsoid
},
success: function(html) {
if (html.status == 'Success') {
location.reload();
@ -2746,7 +2833,10 @@ function viewEqsl(picture, callsign) {
$.ajax({
url: baseURL + 'index.php/qsl/searchQsos',
type: 'post',
data: {'callsign': $('#callsign').val(), 'filename': filename},
data: {
'callsign': $('#callsign').val(),
'filename': filename
},
success: function(html) {
$('#searchresult').empty();
$('#searchresult').append(html);
@ -2848,7 +2938,10 @@ function viewEqsl(picture, callsign) {
$.ajax({
url: baseURL + 'index.php/awards/counties_details_ajax',
type: 'post',
data: {'State': state, 'County': county },
data: {
'State': state,
'County': county
},
success: function(html) {
BootstrapDialog.show({
title: lang_general_word_qso_data,
@ -2917,7 +3010,8 @@ function viewEqsl(picture, callsign) {
$.ajax({
url: base_url + 'index.php/themes/delete',
type: 'post',
data: {'id': id
data: {
'id': id
},
success: function(data) {
$(".theme_" + id).parent("tr:first").remove(); // removes mode from table
@ -2999,15 +3093,33 @@ function viewEqsl(picture, callsign) {
}
switch ($custom_date_format) {
case 'd/m/y': $usethisformat = 'D/MM/YY';break;
case 'd/m/Y': $usethisformat = 'D/MM/YYYY';break;
case 'm/d/y': $usethisformat = 'MM/D/YY';break;
case 'm/d/Y': $usethisformat = 'MM/D/YYYY';break;
case 'd.m.Y': $usethisformat = 'D.MM.YYYY';break;
case 'y/m/d': $usethisformat = 'YY/MM/D';break;
case 'Y-m-d': $usethisformat = 'YYYY-MM-D';break;
case 'M d, Y': $usethisformat = 'MMM D, YYYY';break;
case 'M d, y': $usethisformat = 'MMM D, YY';break;
case 'd/m/y':
$usethisformat = 'D/MM/YY';
break;
case 'd/m/Y':
$usethisformat = 'D/MM/YYYY';
break;
case 'm/d/y':
$usethisformat = 'MM/D/YY';
break;
case 'm/d/Y':
$usethisformat = 'MM/D/YYYY';
break;
case 'd.m.Y':
$usethisformat = 'D.MM.YYYY';
break;
case 'y/m/d':
$usethisformat = 'YY/MM/D';
break;
case 'Y-m-d':
$usethisformat = 'YYYY-MM-D';
break;
case 'M d, Y':
$usethisformat = 'MMM D, YYYY';
break;
case 'M d, y':
$usethisformat = 'MMM D, YY';
break;
}
?>
@ -3035,8 +3147,7 @@ function viewEqsl(picture, callsign) {
},
"order": [0, 'asc'],
dom: 'Bfrtip',
buttons: [
{
buttons: [{
extend: 'csv'
},
{
@ -3072,8 +3183,7 @@ function viewEqsl(picture, callsign) {
},
"order": [0, 'asc'],
dom: 'Bfrtip',
buttons: [
{
buttons: [{
extend: 'csv'
},
{
@ -3107,8 +3217,7 @@ function viewEqsl(picture, callsign) {
url: getDataTablesLanguageUrl(),
},
dom: 'Bfrtip',
buttons: [
{
buttons: [{
extend: 'csv'
},
{
@ -3131,9 +3240,17 @@ function viewEqsl(picture, callsign) {
$(document).ready(function() {
$('.icon_selectBox').off('click').on('click', function() {
var boxcontent = $(this).attr('data-boxcontent');
if ($('.icon_selectBox_data[data-boxcontent="'+boxcontent+'"]').is(":hidden")) { $('.icon_selectBox_data[data-boxcontent="'+boxcontent+'"]').show(); } else { $('.icon_selectBox_data[data-boxcontent="'+boxcontent+'"]').hide(); }
if ($('.icon_selectBox_data[data-boxcontent="' + boxcontent + '"]').is(":hidden")) {
$('.icon_selectBox_data[data-boxcontent="' + boxcontent + '"]').show();
} else {
$('.icon_selectBox_data[data-boxcontent="' + boxcontent + '"]').hide();
}
});
$('.icon_selectBox_data').off('mouseleave').on('mouseleave', function() {
if ($(this).is(":visible")) {
$(this).hide();
}
});
$('.icon_selectBox_data').off('mouseleave').on('mouseleave', function(){ if ($(this).is(":visible")) { $(this).hide(); } });
$('.icon_selectBox_data label').off('click').on('click', function() {
var boxcontent = $(this).closest('.icon_selectBox_data').attr('data-boxcontent');
$('input[name="user_map_' + boxcontent + '_icon"]').attr('value', $(this).attr('data-value'));
@ -3152,8 +3269,7 @@ function viewEqsl(picture, callsign) {
var $open = $($(this).data('parent')).find('.collapse.show');
var additionalOffset = 0;
if($card.prevAll().filter($open.closest('.accordion-item')).length !== 0)
{
if ($card.prevAll().filter($open.closest('.accordion-item')).length !== 0) {
additionalOffset = $open.height();
}
$('html,body').animate({
@ -3178,4 +3294,5 @@ if (isset($scripts) && is_array($scripts)){
?>
</script>
</body>
</html>

4
application/views/user/login.php
Wyświetl plik

@ -34,6 +34,9 @@ body {
<div class="my-2 bg-body rounded-0 shadow-sm card mb-2 shadow-sm">
<div class="card-body">
<h3><?php echo lang('account_login_to_cloudlog'); ?></h3>
<?php $this->load->view('layout/messages'); ?>
<form method="post" action="<?php echo site_url('user/login'); ?>" name="users">
<?php $this->form_validation->set_error_delimiters('', ''); ?>
<input type="hidden" name="id" value="<?php echo $this->uri->segment(3); ?>" />
@ -51,7 +54,6 @@ body {
<div>
<p><small><a class="" href="<?php echo site_url('user/forgot_password'); ?>"><?php echo lang('account_forgot_your_password'); ?></a></small></p>
</div>
<?php $this->load->view('layout/messages'); ?>
<button class="w-100 btn btn-info" type="submit"><?php echo lang('account_login'); ?> →</button>
</form>
</div>

15
application/views/view_log/qso.php
Wyświetl plik

@ -215,6 +215,21 @@
<td><?php echo (strlen($row->COL_SAT_MODE) == 2 ? (strtoupper($row->COL_SAT_MODE[0]).'/'.strtoupper($row->COL_SAT_MODE[1])) : strtoupper($row->COL_SAT_MODE)); ?></td>
</tr>
<?php } ?>
<?php if($row->COL_ANT_AZ != null) { ?>
<tr>
<td><?php echo lang('gen_hamradio_ant_az'); ?></td>
<td><?php echo $row->COL_ANT_AZ; ?>&deg; <span style="margin-left: 2px; display: inline-block; transform: rotate(<?php echo (-45+$row->COL_ANT_AZ); ?>deg);"><i class="fas fa-location-arrow fa-xs"></i></span></td>
</tr>
<?php } ?>
<?php if($row->COL_ANT_EL != null) { ?>
<tr>
<td><?php echo lang('gen_hamradio_ant_el'); ?></td>
<td><?php echo $row->COL_ANT_EL; ?>&deg; <span style="margin-left: 2px; display: inline-block; transform: rotate(<?php echo (-$row->COL_ANT_EL); ?>deg);"><i class="fas fa-arrow-right fa-xs"></i></span></td>
</tr>
<?php } ?>
<?php if($row->name != null) { ?>
<tr>
<td><?php echo lang('general_word_country'); ?></td>

13
assets/css/cyborg/overrides.css
Wyświetl plik

@ -192,3 +192,16 @@ path.grid-worked {
.accordion-button.collapsed {
border-bottom: 1px solid var(--bs-body-bg);
}
/* CSS for Upcoming DXCC Component */
#upcoming_dxccs_component #worked_before {
background-color: #ddffdd;
width: 33%;
color: #000;
}
#upcoming_dxccs_component #not_worked_before {
background-color: #ffdddd;
width: 33%;
color: #000;
}

13
assets/css/cyborg_wide/overrides.css
Wyświetl plik

@ -247,3 +247,16 @@ path.grid-worked {
.accordion-button.collapsed {
border-bottom: 1px solid var(--bs-body-bg);
}
/* CSS for Upcoming DXCC Component */
#upcoming_dxccs_component #worked_before {
background-color: #ddffdd;
width: 33%;
color: #000;
}
#upcoming_dxccs_component #not_worked_before {
background-color: #ffdddd;
width: 33%;
color: #000;
}

11
assets/css/darkly/overrides.css
Wyświetl plik

@ -204,4 +204,15 @@ div.alert-danger {
border-bottom:1px solid var(--bs-body-bg);
}
/* CSS for Upcoming DXCC Component */
#upcoming_dxccs_component #worked_before {
background-color: #ddffdd;
width: 33%;
color: #000;
}
#upcoming_dxccs_component #not_worked_before {
background-color: #ffdddd;
width: 33%;
color: #000;
}

13
assets/css/darkly_wide/overrides.css
Wyświetl plik

@ -259,3 +259,16 @@ div.alert-danger {
.accordion-button.collapsed {
border-bottom:1px solid var(--bs-body-bg);
}
/* CSS for Upcoming DXCC Component */
#upcoming_dxccs_component #worked_before {
background-color: #ddffdd;
width: 33%;
color: #000;
}
#upcoming_dxccs_component #not_worked_before {
background-color: #ffdddd;
width: 33%;
color: #000;
}

11
assets/css/general.css
Wyświetl plik

@ -783,3 +783,14 @@ label {
background-color: rgb(254 243 199) !important;
--bs-badge-color: rgb(217 119 6) !important;
}
/* CSS for Upcoming DXCC Component */
#upcoming_dxccs_component #worked_before {
background-color: #ddffdd;
width: 33%;
}
#upcoming_dxccs_component #not_worked_before {
background-color: #ffdddd;
width: 33%;
}

15
assets/css/superhero/overrides.css
Wyświetl plik

@ -195,3 +195,18 @@ div.alert-danger {
.accordion-body {
border: 1px solid #4e5e6c;
}
/* CSS for Upcoming DXCC Component */
#upcoming_dxccs_component #worked_before {
background-color: #ddffdd;
width: 33%;
color: #000;
box-shadow: none !important;
}
#upcoming_dxccs_component #not_worked_before {
background-color: #ffdddd !important;
width: 33%;
color: #000;
box-shadow: none !important;
}

15
assets/css/superhero_wide/overrides.css
Wyświetl plik

@ -249,3 +249,18 @@ div.alert-danger {
.accordion-body {
border: 1px solid #4e5e6c;
}
/* CSS for Upcoming DXCC Component */
#upcoming_dxccs_component #worked_before {
background-color: #ddffdd;
width: 33%;
color: #000;
box-shadow: none !important;
}
#upcoming_dxccs_component #not_worked_before {
background-color: #ffdddd !important;
width: 33%;
color: #000;
box-shadow: none !important;
}

2
assets/js/sections/common.js
Wyświetl plik

@ -634,5 +634,5 @@ if ($('.table-responsive .dropdown-toggle').length>0) {
}
function getDataTablesLanguageUrl() {
return "../assets/json/datatables_languages/" + lang_datatables_language + ".json";
return base_url + "/assets/json/datatables_languages/" + lang_datatables_language + ".json";
}