Adds export to QO-100 Dx Club menu entry and functionality

pull/2035/head
Hugo Silva 2023-03-17 17:54:35 +00:00
rodzic d7d06c2bbc
commit cbf6efd19f
8 zmienionych plików z 432 dodań i 18 usunięć

Wyświetl plik

@ -0,0 +1,156 @@
<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
/* Controller to interact with the webADIF API */
class Webadif extends CI_Controller {
/*
* Upload QSO to webADIF
* When called from the url cloudlog/webadif/upload, the function loops through all station_id's with a webADIF
* api key defined.
* All QSOs not previously uploaded, will then be uploaded, one at a time
*/
public function upload()
{
$this->setOptions();
$this->load->model('logbook_model');
$station_ids = $this->logbook_model->get_station_id_with_webadif_api();
if ($station_ids) {
foreach ($station_ids as $station) {
$webadif_api_key = $station->webadifapikey;
$webadif_api_url = $station->webadifapiurl;
if ($this->mass_upload_qsos($station->station_id, $webadif_api_key, $webadif_api_url)) {
echo "QSOs have been uploaded to QO-100 Dx Club.";
log_message('info', 'QSOs have been uploaded to QO-100 Dx Club.');
} else {
echo "No QSOs found for upload.";
log_message('info', 'No QSOs found for upload.');
}
}
} else {
echo "No station profiles with a QO-100 Dx Club API Key found.";
log_message('error', "No station profiles with a QO-100 Dx Club API Key found.");
}
}
function setOptions() {
$this->config->load('config');
ini_set('memory_limit', '-1');
ini_set('display_errors', 1);
ini_set('display_startup_errors', 1);
error_reporting(E_ALL);
}
/*
* Function gets all QSOs from given station_id, that are not previously uploaded to webADIF consumer.
* Adif is build for each qso, and then uploaded, one at a time
*/
function mass_upload_qsos($station_id, $webadif_api_key, $webadif_api_url) {
$i = 0;
$data['qsos'] = $this->logbook_model->get_webadif_qsos($station_id);
$errormessages=array();
$CI =& get_instance();
$CI->load->library('AdifHelper');
if ($data['qsos']) {
foreach ($data['qsos']->result() as $qso) {
$adif = $CI->adifhelper->getAdifLine($qso);
$result = $this->logbook_model->push_qso_to_webadif($webadif_api_url, $webadif_api_key, $adif);
if ($result) {
$this->logbook_model->mark_webadif_qsos_sent($qso->COL_PRIMARY_KEY);
$i++;
} else {
$errorMessage = 'QO-100 Dx Club upload failed for qso: Call: ' . $qso->COL_CALL . ' Band: ' . $qso->COL_BAND . ' Mode: ' . $qso->COL_MODE . ' Time: ' . $qso->COL_TIME_ON;
log_message('error', $errorMessage);
$errormessages[] = $errorMessage;
}
}
$result=[];
$result['status'] = 'OK';
$result['count'] = $i;
$result['errormessages'] = $errormessages;
return $result;
} else {
$result=[];
$result['status'] = 'Error';
$result['count'] = $i;
$result['errormessages'] = $errormessages;
return $result;
}
}
/*
* Used for displaying the uid for manually selecting log for upload to webADIF consumer
*/
public function export() {
$this->load->model('stations');
$data['page_title'] = "QO-100 Dx Club Upload";
$data['station_profiles'] = $this->stations->all_of_user();
$data['station_profile'] = $this->stations->stations_with_webadif_api_key();
$this->load->view('interface_assets/header', $data);
$this->load->view('webadif/export');
$this->load->view('interface_assets/footer');
}
/*
* Used for ajax-function when selecting log for upload to webADIF consumer
*/
public function upload_station() {
$this->setOptions();
$this->load->model('stations');
$postData = $this->input->post();
$this->load->model('logbook_model');
$result = $this->logbook_model->exists_webadif_api_key($postData['station_id']);
$webadif_api_key = $result->webadifapikey;
$webadif_api_url = $result->webadifapiurl;
header('Content-type: application/json');
$result = $this->mass_upload_qsos($postData['station_id'], $webadif_api_key, $webadif_api_url);
if ($result['status'] == 'OK') {
$stationinfo = $this->stations->stations_with_webadif_api_key();
$info = $stationinfo->result();
$data['status'] = 'OK';
$data['info'] = $info;
$data['infomessage'] = $result['count'] . " QSOs are now uploaded to QO-100 Dx Club";
$data['errormessages'] = $result['errormessages'];
echo json_encode($data);
} else {
$data['status'] = 'Error';
$data['info'] = 'Error: No QSOs found to upload.';
$data['errormessages'] = $result['errormessages'];
echo json_encode($data);
}
}
public function mark_webadif() {
// Set memory limit to unlimited to allow heavy usage
ini_set('memory_limit', '-1');
$data['page_title'] = "QO-100 Dx Club Upload";
$station_id = $this->security->xss_clean($this->input->post('station_profile'));
$this->load->model('adif_data');
$data['qsos'] = $this->adif_data->export_custom($this->input->post('from'), $this->input->post('to'), $station_id);
$this->load->model('logbook_model');
if ($data['qsos']!==null) {
foreach ($data['qsos']->result() as $qso) {
$this->logbook_model->mark_webadif_qsos_sent($qso->COL_PRIMARY_KEY);
}
}
$this->load->view('interface_assets/header', $data);
$this->load->view('webadif/mark_webadif', $data);
$this->load->view('interface_assets/footer');
}
}

Wyświetl plik

@ -1275,6 +1275,25 @@ class Logbook_model extends CI_Model {
return $query;
}
/*
* Function returns the QSOs from the logbook, which have not been either marked as uploaded to webADIF
*/
function get_webadif_qsos($station_id){
$sql = "
SELECT qsos.*, station_profile.* FROM %s qsos
INNER JOIN station_profile ON qsos.station_id = station_profile.station_id
LEFT JOIN webadif ON qsos.COL_PRIMARY_KEY = webadif.qso_id
WHERE qsos.station_id = %d
AND webadif.upload_date IS NULL
";
$sql = sprintf(
$sql,
$this->config->item('table_name'),
$station_id
);
return $this->db->query($sql);
}
/*
* Function returns all the station_id's with QRZ API Key's
*/
@ -1294,6 +1313,26 @@ class Logbook_model extends CI_Model {
}
}
/*
* Function returns all the station_id's with QRZ API Key's
*/
function get_station_id_with_webadif_api() {
$sql = "
SELECT station_id, webadifapikey, webadifapiurl
FROM station_profile
WHERE COALESCE(webadifapikey, '') <> ''
AND COALESCE(webadifapiurl, '') <> ''
";
$query = $this->db->query($sql);
$result = $query->result();
if ($result) {
return $result;
} else {
return null;
}
}
function get_last_qsos($num, $StationLocationsArray = null) {
if($StationLocationsArray == null) {

Wyświetl plik

@ -345,6 +345,35 @@ class Stations extends CI_Model {
return $query;
}
function stations_with_webadif_api_key() {
$sql="
SELECT station_profile.station_id, station_profile.station_profile_name, station_profile.station_callsign, notc.c notcount, totc.c totcount
FROM station_profile
INNER JOIN (
SELECT qsos.station_id, COUNT(qsos.COL_PRIMARY_KEY) c
FROM %s qsos
LEFT JOIN webadif ON qsos.COL_PRIMARY_KEY = webadif.qso_id
WHERE webadif.qso_id IS NULL
GROUP BY qsos.station_id
) notc
INNER JOIN (
SELECT qsos.station_id, COUNT(qsos.COL_PRIMARY_KEY) c
FROM %s qsos
GROUP BY qsos.station_id
) totc
WHERE COALESCE(station_profile.webadifapikey, '') <> ''
AND COALESCE(station_profile.webadifapiurl, '') <> ''
AND station_profile.user_id = %d
";
$sql=sprintf(
$sql,
$this->config->item('table_name'),
$this->config->item('table_name'),
$this->session->userdata('user_id')
);
return $this->db->query($sql);
}
/*
* Function: are_eqsl_nicks_defined
* Description: Returns number of station profiles with eqslnicknames

Wyświetl plik

@ -70,7 +70,7 @@ function load_was_map() {
<script type="text/javascript" src="<?php echo base_url(); ?>assets/js/sections/continents.js"></script>
<?php } ?>
<?php if ($this->uri->segment(1) == "adif" || $this->uri->segment(1) == "qrz") { ?>
<?php if ($this->uri->segment(1) == "adif" || $this->uri->segment(1) == "qrz" || $this->uri->segment(1) == "webadif") { ?>
<!-- Javascript used for ADIF Import and Export Areas -->
<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/tempusdominus-bootstrap-4.min.js"></script>
@ -112,7 +112,7 @@ function load_was_map() {
console.log("'clicked");
if (navigator.geolocation) {
navigator.geolocation.getCurrentPosition(showPosition);
} else {
} else {
console.log('Geolocation is not supported by this browser.');
}
}
@ -363,7 +363,7 @@ $(function () {
$(".bootstrap-dialog-message").prepend('<div class="alert alert-danger"><a href="#" class="close" data-dismiss="alert" aria-label="close">&times;</a>The stored query has been deleted!</div>');
$("#query_" + id).remove(); // removes query from table in dialog
$("#querydropdown option[value='" + id + "']").remove(); // removes query from dropdown
if ($("#querydropdown option").length == 0) {
if ($("#querydropdown option").length == 0) {
$("#btn-edit").remove();
$('.querydropdownform').remove();
};
@ -549,7 +549,7 @@ 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: 9, attribution: osmAttrib});
var osm = new L.TileLayer(osmUrl, {minZoom: 1, maxZoom: 9, attribution: osmAttrib});
var redIcon = L.icon({
iconUrl: icon_dot_url,
@ -602,7 +602,7 @@ 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: 9, attribution: osmAttrib});
var osm = new L.TileLayer(osmUrl, {minZoom: 1, maxZoom: 9, attribution: osmAttrib});
map.addLayer(osm);
}
@ -730,13 +730,13 @@ function showActivatorsMap(call, count, grids) {
});
$(function () {
// hold onto the drop down menu
// hold onto the drop down menu
var dropdownMenu;
// and when you show it, move it to the body
// and when you show it, move it to the body
$(window).on('show.bs.dropdown', function (e) {
// grab the menu
// grab the menu
dropdownMenu = $(e.target).find('.dropdown-menu');
// detach it and append it to the body
@ -753,7 +753,7 @@ function showActivatorsMap(call, count, grids) {
});
});
// and when you hide it, reattach the drop down, and hide it normally
// and when you hide it, reattach the drop down, and hide it normally
$(window).on('hide.bs.dropdown', function (e) {
$(e.target).append(dropdownMenu.detach());
dropdownMenu.hide();
@ -882,7 +882,7 @@ $(document).on('keypress',function(e) {
<?php if ($this->uri->segment(1) == "qso") { ?>
<script src="<?php echo base_url() ;?>assets/js/sections/qso.js"></script>
<?php
<?php
$this->load->model('stations');
$active_station_id = $this->stations->find_active();
@ -1581,6 +1581,9 @@ $(document).ready(function(){
<?php if ($this->uri->segment(1) == "qrz") { ?>
<script src="<?php echo base_url(); ?>assets/js/sections/qrzlogbook.js"></script>
<?php } ?>
<?php if ($this->uri->segment(1) == "webadif") { ?>
<script src="<?php echo base_url(); ?>assets/js/sections/webadif.js"></script>
<?php } ?>
<script>
function displayQso(id) {
@ -1608,7 +1611,7 @@ $(document).ready(function(){
attribution: '<?php echo $this->optionslib->get_option('option_map_tile_server_copyright');?>',
}).addTo(mymap);
var printer = L.easyPrint({
tileLayer: tiles,
sizeModes: ['Current'],
@ -1830,7 +1833,7 @@ $(document).ready(function(){
<?php } ?>
<script>
function selectize_usa_county() {
var baseURL= "<?php echo base_url();?>";
$('#stationCntyInputEdit').selectize({
@ -2029,7 +2032,7 @@ $(document).ready(function(){
<script src="<?php echo base_url(); ?>assets/js/sections/timeplot.js"></script>
<?php } ?>
<?php if ($this->uri->segment(1) == "qsl") {
<?php if ($this->uri->segment(1) == "qsl") {
// Get Date format
if($this->session->userdata('user_date_format')) {
// If Logged in and session exists
@ -2050,7 +2053,7 @@ $(document).ready(function(){
case 'M d, Y': $usethisformat = 'MMM D, YYYY';break;
case 'M d, y': $usethisformat = 'MMM D, YY';break;
}
?>
<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>
@ -2066,8 +2069,8 @@ $(document).ready(function(){
"scrollX": true,
"order": [ 2, 'desc' ],
});
</script>
<?php } ?>

Wyświetl plik

@ -39,7 +39,7 @@
<?php if ($this->uri->segment(1) == "adif" || (isset($hasDatePicker) && $hasDatePicker)) { ?>
<link rel="stylesheet" href="<?php echo base_url(); ?>assets/css/datepicker.css" />
<?php } ?>
<?php if (file_exists(APPPATH.'../assets/css/custom.css')) { echo '<link rel="stylesheet" href="'.base_url().'assets/css/custom.css">'; } ?>
<link rel="icon" href="<?php echo base_url(); ?>favicon.ico">
@ -214,7 +214,7 @@
<a class="dropdown-item" href="<?php echo site_url('user/edit')."/".$this->session->userdata('user_id'); ?>" title="Account"><i class="fas fa-user"></i> Account</a>
<a class="dropdown-item" href="<?php echo site_url('logbooks');?>" title="Manage station logbooks"><i class="fas fa-home"></i> Station Logbooks</a>
<a class="dropdown-item" href="<?php echo site_url('station');?>" title="Manage station locations"><i class="fas fa-home"></i> Station Locations</a>
<a class="dropdown-item" href="<?php echo site_url('band');?>" title="Manage Bands"><i class="fas fa-cog"></i> Bands</a>
@ -256,6 +256,8 @@ $oqrs_requests = $CI->oqrs_model->oqrs_requests($location_list);
<a class="dropdown-item" href="<?php echo site_url('qrz/export');?>" title="Upload to QRZ.com logbook"><i class="fas fa-sync"></i> QRZ Logbook</a>
<a class="dropdown-item" href="<?php echo site_url('webadif/export');?>" title="Upload to webADIF"><i class="fas fa-sync"></i> QO-100 Dx Club Upload</a>
<div class="dropdown-divider"></div>
<a class="dropdown-item" href="<?php echo site_url('api/help');?>" title="Manage API keys"><i class="fas fa-key"></i> API Keys</a>

Wyświetl plik

@ -0,0 +1,93 @@
<div class="container adif">
<h2><?php echo $page_title; ?></h2>
<div class="card">
<div class="card-header">
<ul class="nav nav-tabs card-header-tabs pull-right" role="tablist">
<li class="nav-item">
<a class="nav-link active" id="export-tab" data-toggle="tab" href="#export" role="tab" aria-controls="import" aria-selected="true">Upload Logbook</a>
</li>
<li class="nav-item">
<a class="nav-link" id="mark-tab" data-toggle="tab" href="#mark" role="tab" aria-controls="export" aria-selected="false">Mark QSOs</a>
</li>
</ul>
</div>
<div class="card-body">
<div class="tab-content">
<div class="tab-pane active" id="export" role="tabpanel" aria-labelledby="export-tab">
<p>Here you can see and upload all QSOs which have not been previously uploaded to QO-100 Dx Club.</p>
<p>You need to set a QO-100 Dx Club API key in your station profile. Only station profiles with an API Key are displayed.</p>
<p><span class="badge badge-warning">Warning</span>This might take a while as QSO uploads are processed sequentially.</p>
<?php
if ($station_profile->result()) {
echo '
<table class="table table-bordered table-hover table-striped table-condensed text-center">
<thead>
<tr>
<td>Profile name</td>
<td>Station callsign</td>
<td>Total QSOs not uploaded</td>
<td>Total QSOs uploaded</td>
<td>Actions</td>
</thead>
<tbody>';
foreach ($station_profile->result() as $station) { // Fills the table with the data
echo '<tr>';
echo '<td>' . $station->station_profile_name . '</td>';
echo '<td>' . $station->station_callsign . '</td>';
echo '<td id ="notcount'.$station->station_id.'">' . $station->notcount . '</td>';
echo '<td id ="totcount'.$station->station_id.'">' . $station->totcount . '</td>';
echo '<td><button id="webadifUpload" type="button" name="webadifUpload" class="btn btn-primary btn-sm ld-ext-right" onclick="ExportWebADIF('. $station->station_id .')"><i class="fas fa-cloud-upload-alt"></i> Upload<div class="ld ld-ring ld-spin"></div></button></td>';
echo '</tr>';
}
echo '</tfoot></table>';
}
else {
echo '<div class="alert alert-danger" role="alert"><a href="#" class="close" data-dismiss="alert" aria-label="close">&times;</a>Nothing found!</div>';
}
?>
</div>
<div class="tab-pane fade" id="mark" role="tabpanel" aria-labelledby="home-tab">
<form class="form" action="<?php echo site_url('webadif/mark_webadif'); ?>" method="post" enctype="multipart/form-data">
<select name="station_profile" class="custom-select mb-4 mr-sm-4" style="width: 30%;">
<option value="0">Select Station Location</option>
<?php foreach ($station_profiles->result() as $station) { ?>
<option value="<?php echo $station->station_id; ?>">Callsign: <?php echo $station->station_callsign; ?> (<?php echo $station->station_profile_name; ?>)</option>
<?php } ?>
</select>
<p><span class="badge badge-warning">Warning</span> If a date range is not selected then all QSOs will be marked!</p>
<p class="card-text">From date:</p>
<div class="row">
<div class="input-group date col-md-3" id="datetimepicker5" data-target-input="nearest">
<input name="from" type="text" placeholder="DD/MM/YYYY" class="form-control datetimepicker-input" data-target="#datetimepicker1"/>
<div class="input-group-append" data-target="#datetimepicker5" data-toggle="datetimepicker">
<div class="input-group-text"><i class="fa fa-calendar"></i></div>
</div>
</div>
</div>
<p class="card-text">To date:</p>
<div class="row">
<div class="input-group date col-md-3" id="datetimepicker6" data-target-input="nearest">
<input name="to" "totype="text" placeholder="DD/MM/YYYY" class="form-control datetimepicker-input" data-target="#datetimepicker2"/>
<div class="input-group-append" data-target="#datetimepicker6" data-toggle="datetimepicker">
<div class="input-group-text"><i class="fa fa-calendar"></i></div>
</div>
</div>
</div>
<br>
<button type="button" id="markWebAdifAsExported" class="btn-sm btn-primary" value="Export">Mark QSOs as exported to QO-100 Dx Club</button>
</form>
</div>
</div>
</div>
</div>
</div>

Wyświetl plik

@ -0,0 +1,22 @@
<div class="container">
<br>
<?php if($this->session->flashdata('message')) { ?>
<!-- Display Message -->
<div class="alert-message error">
<p><?php echo $this->session->flashdata('message'); ?></p>
</div>
<?php } ?>
<div class="card">
<div class="card-header">
QSOs marked
</div>
<div class="card-body">
<h3 class="card-title">Yay, it's done!</h3>
<p class="card-text">The QSOs are marked as exported to QO-100 Dx Club.</p>
</div>
</div>
</div>

Wyświetl plik

@ -0,0 +1,70 @@
$(function () {
$('#datetimepicker5').datetimepicker({
format: 'DD/MM/YYYY',
});
});
$(function () {
$('#datetimepicker6').datetimepicker({
format: 'DD/MM/YYYY',
});
});
$(document).ready(function(){
$('#markWebAdifAsExported').click(function(e){
let form = $(this).closest('form');
let station = form.find('select[name=station_profile]');
if (station.val() == 0) {
station.addClass('is-invalid');
}else{
form.submit();
}
})
});
function ExportWebADIF(station_id) {
if ($(".alert").length > 0) {
$(".alert").remove();
}
if ($(".errormessages").length > 0) {
$(".errormessages").remove();
}
$(".ld-ext-right").addClass('running');
$(".ld-ext-right").prop('disabled', true);
$.ajax({
url: base_url + 'index.php/webadif/upload_station',
type: 'post',
data: {'station_id': station_id},
success: function (data) {
$(".ld-ext-right").removeClass('running');
$(".ld-ext-right").prop('disabled', false);
if (data.status == 'OK') {
$.each(data.info, function(index, value){
$('#notcount'+value.station_id).html(value.notcount);
$('#totcount'+value.station_id).html(value.totcount);
});
$(".card-body").append('<div class="alert alert-success" role="alert"><a href="#" class="close" data-dismiss="alert" aria-label="close">&times;</a>' + data.infomessage + '</div>');
}
else {
$(".card-body").append('<div class="alert alert-danger" role="alert"><a href="#" class="close" data-dismiss="alert" aria-label="close">&times;</a>' + data.info + '</div>');
}
if (data.errormessages.length > 0) {
$(".card-body").append('' +
'<div class="errormessages"><p>\n' +
' <button class="btn btn-danger" type="button" data-toggle="collapse" data-target="#collapseExample" aria-expanded="false" aria-controls="collapseExample">\n' +
' Show error messages\n' +
' </button>\n' +
' </p>\n' +
' <div class="collapse" id="collapseExample">\n' +
' <div class="card card-body"><div class="errors"></div>\n' +
' </div>\n' +
' </div></div>');
$.each(data.errormessages, function(index, value) {
$(".errors").append('<li>' + value);
});
}
}
});
}