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

Added "All" to Bandchooser at List

pull/2326/head
int2001 2023-07-26 08:22:53 +00:00
rodzic 4717ca2252
commit e1003e07d7
Nie znaleziono w bazie danych klucza dla tego podpisu
ID klucza GPG: DFB1C13CD2DB037B
3 zmienionych plików z 99 dodań i 74 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

130
application/models/Dxcluster_model.php
Wyświetl plik

@ -3,78 +3,82 @@
use Cloudlog\Dxcc\Dxcc;
class Dxcluster_model extends CI_Model {
public function dxc_spotlist($band = '20m', $maxage = 60, $de = '') {
public function dxc_spotlist($band = '20m', $maxage = 60, $de = '') {
$this->load->helper(array('psr4_autoloader'));
$CI =& get_instance();
if ( ($this->optionslib->get_option('dxcache_url') != '') ) {
if($CI->session->userdata('user_date_format')) {
$custom_date_format = $CI->session->userdata('user_date_format');
} else {
$custom_date_format = $CI->config->item('qso_date_format');
}
$CI =& get_instance();
if ( ($this->optionslib->get_option('dxcache_url') != '') ) {
if($CI->session->userdata('user_date_format')) {
$custom_date_format = $CI->session->userdata('user_date_format');
} else {
$custom_date_format = $CI->config->item('qso_date_format');
}
$dxcache_url = $this->optionslib->get_option('dxcache_url').'/spots/'.$band;
$CI->load->model('logbooks_model');
if ($band == "All") {
$dxcache_url = $this->optionslib->get_option('dxcache_url').'/spots/';
} else {
$dxcache_url = $this->optionslib->get_option('dxcache_url').'/spots/'.$band;
}
$CI->load->model('logbooks_model');
$CI->load->model('logbook_model');
$logbooks_locations_array = $CI->logbooks_model->list_logbook_relationships($this->session->userdata('active_station_logbook'));
$logbooks_locations_array = $CI->logbooks_model->list_logbook_relationships($this->session->userdata('active_station_logbook'));
// CURL Functions
$ch = curl_init();
curl_setopt($ch, CURLOPT_URL, $dxcache_url);
curl_setopt($ch, CURLOPT_USERAGENT, 'Cloudlog DXLookup');
curl_setopt($ch, CURLOPT_HEADER, false);
curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
$jsonraw = curl_exec($ch);
curl_close($ch);
$json = json_decode($jsonraw);
// CURL Functions
$ch = curl_init();
curl_setopt($ch, CURLOPT_URL, $dxcache_url);
curl_setopt($ch, CURLOPT_USERAGENT, 'Cloudlog DXLookup');
curl_setopt($ch, CURLOPT_HEADER, false);
curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
$jsonraw = curl_exec($ch);
curl_close($ch);
$json = json_decode($jsonraw);
$date = date('Ymd', time());
$dxccObj = new DXCC($date);
// Create JSON object
if (strlen($jsonraw)>20) {
$spotsout=[];
foreach($json as $singlespot){
$spotband = $CI->frequency->GetBand($singlespot->frequency*1000);
$singlespot->band=$spotband;
if ($band != $spotband) { continue; }
$datetimecurrent = new DateTime("now", new DateTimeZone('UTC')); // Today's Date/Time
$datetimespot = new DateTime($singlespot->when, new DateTimeZone('UTC'));
$spotage = $datetimecurrent->diff($datetimespot);
$minutes = $spotage->days * 24 * 60;
$minutes += $spotage->h * 60;
$minutes += $spotage->i;
$singlespot->age=$minutes;
$singlespot->when_pretty=date($custom_date_format . " H:i", strtotime($singlespot->when));
// Create JSON object
if (strlen($jsonraw)>20) {
$spotsout=[];
foreach($json as $singlespot){
$spotband = $CI->frequency->GetBand($singlespot->frequency*1000);
$singlespot->band=$spotband;
if (($band != 'All') && ($band != $spotband)) { continue; }
$datetimecurrent = new DateTime("now", new DateTimeZone('UTC')); // Today's Date/Time
$datetimespot = new DateTime($singlespot->when, new DateTimeZone('UTC'));
$spotage = $datetimecurrent->diff($datetimespot);
$minutes = $spotage->days * 24 * 60;
$minutes += $spotage->h * 60;
$minutes += $spotage->i;
$singlespot->age=$minutes;
$singlespot->when_pretty=date($custom_date_format . " H:i", strtotime($singlespot->when));
if ($minutes<=$maxage) {
if (!(property_exists($singlespot,'dxcc_spotted'))) { // Check if we already have dxcc of spotted
$dxcc=$dxccObj->dxcc_lookup($singlespot->spotted,date('Ymd', time()));
$singlespot->dxcc_spotted=$dxcc;
}
if (!(property_exists($singlespot,'dxcc_spotter'))) { // Check if we already have dxcc of spotter
$dxcc=$dxccObj->dxcc_lookup($singlespot->spotter,date('Ymd', time()));
$singlespot->dxcc_spotter=$dxcc;
}
if ( ($de != '') && ($de != 'Any') && (property_exists($singlespot->dxcc_spotter,'cont')) ){ // If we have a "de continent" and a filter-wish filter on that
if (strtolower($de) == strtolower($singlespot->dxcc_spotter->cont)) {
$singlespot->worked_call = ($this->logbook_model->check_if_callsign_worked_in_logbook($singlespot->spotted, $logbooks_locations_array, $singlespot->band) == 1);
array_push($spotsout,$singlespot);
}
} else { // No de continent? No Filter --> Just push
$singlespot->worked_call = ($this->logbook_model->check_if_callsign_worked_in_logbook($singlespot->spotted, $logbooks_locations_array, $singlespot->band) == 1);
array_push($spotsout,$singlespot);
}
}
}
return ($spotsout);
} else {
return '';
}
} else {
return '';
}
}
if ($minutes<=$maxage) {
if (!(property_exists($singlespot,'dxcc_spotted'))) { // Check if we already have dxcc of spotted
$dxcc=$dxccObj->dxcc_lookup($singlespot->spotted,date('Ymd', time()));
$singlespot->dxcc_spotted=$dxcc;
}
if (!(property_exists($singlespot,'dxcc_spotter'))) { // Check if we already have dxcc of spotter
$dxcc=$dxccObj->dxcc_lookup($singlespot->spotter,date('Ymd', time()));
$singlespot->dxcc_spotter=$dxcc;
}
if ( ($de != '') && ($de != 'Any') && (property_exists($singlespot->dxcc_spotter,'cont')) ){ // If we have a "de continent" and a filter-wish filter on that
if (strtolower($de) == strtolower($singlespot->dxcc_spotter->cont)) {
$singlespot->worked_call = ($this->logbook_model->check_if_callsign_worked_in_logbook($singlespot->spotted, $logbooks_locations_array, $singlespot->band) == 1);
array_push($spotsout,$singlespot);
}
} else { // No de continent? No Filter --> Just push
$singlespot->worked_call = ($this->logbook_model->check_if_callsign_worked_in_logbook($singlespot->spotted, $logbooks_locations_array, $singlespot->band) == 1);
array_push($spotsout,$singlespot);
}
}
}
return ($spotsout);
} else {
return '';
}
} else {
return '';
}
}
public function dxc_qrg_lookup($qrg, $maxage = 120) {
$this->load->helper(array('psr4_autoloader'));

4
application/views/bandmap/list.php
Wyświetl plik

@ -6,6 +6,9 @@
</script>
<style>
.kHz::after {
content: " kHz";
}
.fresh{
-webkit-transition: all 15s ease;
-moz-transition: all 15s ease;
@ -56,6 +59,7 @@
<label class="my-1 mr-2" for="band"><?php echo lang('gen_hamradio_band'); ?></label>
<select id="band" class="form-control-sm my-1 mr-sm-2" name="band">
<option value="All">All</option>
<?php foreach($bands as $key=>$bandgroup) {
echo '<optgroup label="' . strtoupper($key) . '">';
foreach($bandgroup as $band) {

39
assets/js/sections/bandmap_list.js
Wyświetl plik

@ -6,9 +6,24 @@ $(function() {
return ((a< b) ? -1 : ((a> b) ? 1 : 0));
}
function get_dtable () {
var table = $('.spottable').DataTable({
"retrieve":true,
'columnDefs': [
{
'targets': 1, "type":"num",
'createdCell': function (td, cellData, rowData, row, col) {
$(td).addClass("kHz");
}
}
]
});
return table;
}
function fill_list(band,de,maxAgeMinutes) {
var table = $('.spottable').DataTable();
// var table = $('.spottable').DataTable();
var table = get_dtable();
if ((band != '') && (band !== undefined)) {
let dxurl = dxcluster_provider + "/spots/" + band + "/" +maxAgeMinutes + "/" + de;
$.ajax({
@ -25,7 +40,7 @@ $(function() {
var data=[];
data[0]=[];
data[0].push(single.when_pretty);
data[0].push(single.frequency + " kHz");
data[0].push(single.frequency*1);
data[0].push((single.worked_call ?'<span class="text-success">' : '')+single.spotted+(single.worked_call ? '</span>' : ''));
data[0].push(single.dxcc_spotted.entity);
data[0].push(single.spotter);
@ -57,7 +72,8 @@ $(function() {
}
function highlight_current_qrg(qrg) {
var table=$('.spottable').DataTable();
var table=get_dtable();
// var table=$('.spottable').DataTable();
table.rows().every(function() {
var d=this.data();
var distance=Math.abs(parseInt(d[1].substring(0,d[1].length-4))-qrg);
@ -71,27 +87,28 @@ $(function() {
});
}
$('.spottable').DataTable().order([1, 'asc']);
$('.spottable').DataTable().clear();
var table=get_dtable();
table.order([1, 'asc']);
table.clear();
fill_list($('#band option:selected').val(), $('#decontSelect option:selected').val(),dxcluster_maxage);
setInterval(function () { fill_list($('#band option:selected').val(), $('#decontSelect option:selected').val(),dxcluster_maxage); },60000);
$("#decontSelect").on("change",function() {
$('.spottable').DataTable().clear();
table.clear();
fill_list($('#band option:selected').val(), $('#decontSelect option:selected').val(),dxcluster_maxage);
});
$("#band").on("change",function() {
$('.spottable').DataTable().order([1, 'asc']);
$('.spottable').DataTable().clear();
table.order([1, 'asc']);
table.clear();
fill_list($('#band option:selected').val(), $('#decontSelect option:selected').val(),dxcluster_maxage);
});
$("#spottertoggle").on("click", function() {
if ($('.spottable').DataTable().column(4).visible()) {
$('.spottable').DataTable().column(4).visible(false);
if (table.column(4).visible()) {
table.column(4).visible(false);
} else {
$('.spottable').DataTable().column(4).visible(true);
table.column(4).visible(true);
}
});