goodspeed/Cloudlog
1
0
派生 0
代码 工单 合并请求 项目 版本发布 软件包 百科 动态 Actions

fixed success and error messages

浏览代码
这个提交包含在：
HB9HIL 2023-12-16 11:42:56 +01:00
父节点 ee989de988
当前提交 e71f782a83
共有 8 个文件被更改，包括 81 次插入 和 70 次删除
显示统计信息 下载 Patch 文件 下载 Diff 文件 展开所有文件 折叠所有文件

24
application/controllers/Hrdlog.php
查看文件

@ -1,4 +1,4 @@
<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed'); <?php if (!defined('BASEPATH')) exit('No direct script access allowed');
/* /*
Controller to interact with the hrdlog.net API Controller to interact with the hrdlog.net API
@ -22,10 +22,10 @@ class Hrdlog extends CI_Controller {
foreach ($station_ids as $station) { foreach ($station_ids as $station) {
$hrdlog_username = $station->hrdlog_username; $hrdlog_username = $station->hrdlog_username;
$hrdlog_code = $station->hrdlog_code; $hrdlog_code = $station->hrdlog_code;
if($this->mass_upload_qsos($station->station_id, $hrdlog_username, $hrdlog_code)) { if ($this->mass_upload_qsos($station->station_id, $hrdlog_username, $hrdlog_code)) {
echo "QSOs have been uploaded to hrdlog.net."; echo "QSOs have been uploaded to hrdlog.net.";
log_message('info', 'QSOs have been uploaded to hrdlog.net.'); log_message('info', 'QSOs have been uploaded to hrdlog.net.');
} else{ } else {
echo "No QSOs found for upload."; echo "No QSOs found for upload.";
log_message('info', 'No QSOs found for upload.'); log_message('info', 'No QSOs found for upload.');
} }
@ -52,9 +52,9 @@ class Hrdlog extends CI_Controller {
function mass_upload_qsos($station_id, $hrdlog_username, $hrdlog_code) { function mass_upload_qsos($station_id, $hrdlog_username, $hrdlog_code) {
$i = 0; $i = 0;
$data['qsos'] = $this->logbook_model->get_hrdlog_qsos($station_id); $data['qsos'] = $this->logbook_model->get_hrdlog_qsos($station_id);
$errormessages=array(); $errormessages = array();
$CI =& get_instance(); $CI = &get_instance();
$CI->load->library('AdifHelper'); $CI->load->library('AdifHelper');
if ($data['qsos']) { if ($data['qsos']) {
@ -67,22 +67,24 @@ class Hrdlog extends CI_Controller {
$result = $this->logbook_model->push_qso_to_hrdlog($hrdlog_username, $hrdlog_code, $adif); $result = $this->logbook_model->push_qso_to_hrdlog($hrdlog_username, $hrdlog_code, $adif);
} }
if ( ($result['status'] == 'OK') || ( ($result['status'] == 'error') || ($result['status'] == 'duplicate')) ){ if (($result['status'] == 'OK') || (($result['status'] == 'error') || ($result['status'] == 'duplicate'))) {
$this->markqso($qso->COL_PRIMARY_KEY); $this->markqso($qso->COL_PRIMARY_KEY);
$i++; $i++;
} elseif ((substr($result['status'],0,11) == 'auth_error')) { $result['status'] = 'OK';
} elseif ((substr($result['status'], 0, 11) == 'auth_error')) {
log_message('error', 'hrdlog upload failed for qso: Call: ' . $qso->COL_CALL . ' Band: ' . $qso->COL_BAND . ' Mode: ' . $qso->COL_MODE . ' Time: ' . $qso->COL_TIME_ON); log_message('error', 'hrdlog upload failed for qso: Call: ' . $qso->COL_CALL . ' Band: ' . $qso->COL_BAND . ' Mode: ' . $qso->COL_MODE . ' Time: ' . $qso->COL_TIME_ON);
log_message('error', 'hrdlog upload failed with the following message: ' .$result['message']); log_message('error', 'hrdlog upload failed with the following message: ' . $result['message']);
log_message('error', 'hrdlog upload stopped for Station_ID: ' .$station_id); log_message('error', 'hrdlog upload stopped for Station_ID: ' . $station_id);
$errormessages[] = $result['message'] . 'Invalid HRDLog-Code, stopped at Call: ' . $qso->COL_CALL . ' Band: ' . $qso->COL_BAND . ' Mode: ' . $qso->COL_MODE . ' Time: ' . $qso->COL_TIME_ON; $errormessages[] = $result['message'] . 'Invalid HRDLog-Code, stopped at Call: ' . $qso->COL_CALL . ' Band: ' . $qso->COL_BAND . ' Mode: ' . $qso->COL_MODE . ' Time: ' . $qso->COL_TIME_ON;
$result['status'] = 'Error';
break; /* If key is invalid, immediate stop syncing for more QSOs of this station */ break; /* If key is invalid, immediate stop syncing for more QSOs of this station */
} else { } else {
log_message('error', 'hrdlog upload failed for qso: Call: ' . $qso->COL_CALL . ' Band: ' . $qso->COL_BAND . ' Mode: ' . $qso->COL_MODE . ' Time: ' . $qso->COL_TIME_ON); log_message('error', 'hrdlog upload failed for qso: Call: ' . $qso->COL_CALL . ' Band: ' . $qso->COL_BAND . ' Mode: ' . $qso->COL_MODE . ' Time: ' . $qso->COL_TIME_ON);
log_message('error', 'hrdlog upload failed with the following message: ' .$result['message']); log_message('error', 'hrdlog upload failed with the following message: ' . $result['message']);
$result['status'] = 'Error';
$errormessages[] = $result['message'] . ' Call: ' . $qso->COL_CALL . ' Band: ' . $qso->COL_BAND . ' Mode: ' . $qso->COL_MODE . ' Time: ' . $qso->COL_TIME_ON; $errormessages[] = $result['message'] . ' Call: ' . $qso->COL_CALL . ' Band: ' . $qso->COL_BAND . ' Mode: ' . $qso->COL_MODE . ' Time: ' . $qso->COL_TIME_ON;
} }
} }
$result['status'] = 'OK';
$result['count'] = $i; $result['count'] = $i;
$result['errormessages'] = $errormessages; $result['errormessages'] = $errormessages;
return $result; return $result;

4
application/controllers/Qrz.php
查看文件

@ -74,19 +74,21 @@ class Qrz extends CI_Controller {
if ( ($result['status'] == 'OK') || ( ($result['status'] == 'error') && ($result['message'] == 'STATUS=FAIL&REASON=Unable to add QSO to database: duplicate&EXTENDED=')) ){ if ( ($result['status'] == 'OK') || ( ($result['status'] == 'error') && ($result['message'] == 'STATUS=FAIL&REASON=Unable to add QSO to database: duplicate&EXTENDED=')) ){
$this->markqso($qso->COL_PRIMARY_KEY); $this->markqso($qso->COL_PRIMARY_KEY);
$i++; $i++;
$result['status'] = 'OK';
} elseif ( ($result['status']=='error') && (substr($result['message'],0,11) == 'STATUS=AUTH')) { } elseif ( ($result['status']=='error') && (substr($result['message'],0,11) == 'STATUS=AUTH')) {
log_message('error', 'QRZ upload failed for qso: Call: ' . $qso->COL_CALL . ' Band: ' . $qso->COL_BAND . ' Mode: ' . $qso->COL_MODE . ' Time: ' . $qso->COL_TIME_ON); log_message('error', 'QRZ upload failed for qso: Call: ' . $qso->COL_CALL . ' Band: ' . $qso->COL_BAND . ' Mode: ' . $qso->COL_MODE . ' Time: ' . $qso->COL_TIME_ON);
log_message('error', 'QRZ upload failed with the following message: ' .$result['message']); log_message('error', 'QRZ upload failed with the following message: ' .$result['message']);
log_message('error', 'QRZ upload stopped for Station_ID: ' .$station_id); log_message('error', 'QRZ upload stopped for Station_ID: ' .$station_id);
$errormessages[] = $result['message'] . ' Call: ' . $qso->COL_CALL . ' Band: ' . $qso->COL_BAND . ' Mode: ' . $qso->COL_MODE . ' Time: ' . $qso->COL_TIME_ON; $errormessages[] = $result['message'] . ' Call: ' . $qso->COL_CALL . ' Band: ' . $qso->COL_BAND . ' Mode: ' . $qso->COL_MODE . ' Time: ' . $qso->COL_TIME_ON;
$result['status'] = 'Error';
break; /* If key is invalid, immediate stop syncing for more QSOs of this station */ break; /* If key is invalid, immediate stop syncing for more QSOs of this station */
} else { } else {
log_message('error', 'QRZ upload failed for qso: Call: ' . $qso->COL_CALL . ' Band: ' . $qso->COL_BAND . ' Mode: ' . $qso->COL_MODE . ' Time: ' . $qso->COL_TIME_ON); log_message('error', 'QRZ upload failed for qso: Call: ' . $qso->COL_CALL . ' Band: ' . $qso->COL_BAND . ' Mode: ' . $qso->COL_MODE . ' Time: ' . $qso->COL_TIME_ON);
log_message('error', 'QRZ upload failed with the following message: ' .$result['message']); log_message('error', 'QRZ upload failed with the following message: ' .$result['message']);
$errormessages[] = $result['message'] . ' Call: ' . $qso->COL_CALL . ' Band: ' . $qso->COL_BAND . ' Mode: ' . $qso->COL_MODE . ' Time: ' . $qso->COL_TIME_ON; $errormessages[] = $result['message'] . ' Call: ' . $qso->COL_CALL . ' Band: ' . $qso->COL_BAND . ' Mode: ' . $qso->COL_MODE . ' Time: ' . $qso->COL_TIME_ON;
$result['status'] = 'Error';
} }
} }
$result['status'] = 'OK';
$result['count'] = $i; $result['count'] = $i;
$result['errormessages'] = $errormessages; $result['errormessages'] = $errormessages;
return $result; return $result;

2
application/views/adif/import.php
查看文件

@ -1,4 +1,4 @@
<div class="container adif"> <div class="container adif" id="adif_import">
<h2><?php echo $page_title; ?></h2> <h2><?php echo $page_title; ?></h2>
<?php <?php

2
application/views/hrdlog/export.php
查看文件

@ -1,5 +1,5 @@
<div class="container adif"> <div class="container adif" id="hrdlog_export">
<h2><?php echo $page_title; ?></h2> <h2><?php echo $page_title; ?></h2>

2
application/views/qrz/export.php
查看文件

@ -1,5 +1,5 @@
<div class="container adif"> <div class="container adif" id="qrz_export">
<h2><?php echo $page_title; ?></h2> <h2><?php echo $page_title; ?></h2>

27
assets/js/sections/hrdlog.js
查看文件

@ -21,27 +21,30 @@ function ExportHrd(station_id) {
$('#notcount'+value.station_id).html(value.notcount); $('#notcount'+value.station_id).html(value.notcount);
$('#totcount'+value.station_id).html(value.totcount); $('#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>'); $(".card-body").append('<div class="alert alert-success" role="alert">' + data.infomessage + '</div>');
} }
else { 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>'); $(".card-body").append('<div class="alert alert-danger" role="alert">' + data.info + '</div>');
} }
if (data.errormessages.length > 0) { if (data.errormessages.length > 0) {
$(".card-body").append('' + $("#hrdlog_export").append(
'<div class="errormessages"><p>\n' + '<div class="errormessages">\n' +
' <button class="btn btn-danger" type="button" data-toggle="collapse" data-target="#collapseExample" aria-expanded="false" aria-controls="collapseExample">\n' + ' <div class="card mt-2">\n' +
' Show error messages\n' + ' <div class="card-header bg-danger">\n' +
' </button>\n' + ' Error Message\n' +
' </p>\n' +
' <div class="collapse" id="collapseExample">\n' +
' <div class="card card-body"><div class="errors"></div>\n' +
' </div>\n' + ' </div>\n' +
' </div></div>'); ' <div class="card-body">\n' +
$.each(data.errormessages, function(index, value) { ' <div class="errors"></div>\n' +
' </div>\n' +
' </div>\n' +
'</div>'
);
$.each(data.errormessages, function (index, value) {
$(".errors").append('<li>' + value); $(".errors").append('<li>' + value);
}); });
} }
} }
}); });
} }

26
assets/js/sections/qrzlogbook.js
查看文件

@ -21,24 +21,26 @@ function ExportQrz(station_id) {
$('#notcount'+value.station_id).html(value.notcount); $('#notcount'+value.station_id).html(value.notcount);
$('#totcount'+value.station_id).html(value.totcount); $('#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>'); $(".card-body").append('<div class="alert alert-success" role="alert">' + data.infomessage + '</div>');
} }
else { 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>'); $(".card-body").append('<div class="alert alert-danger" role="alert">' + data.info + '</div>');
} }
if (data.errormessages.length > 0) { if (data.errormessages.length > 0) {
$(".card-body").append('' + $("#qrz_export").append(
'<div class="errormessages"><p>\n' + '<div class="errormessages">\n' +
' <button class="btn btn-danger" type="button" data-toggle="collapse" data-target="#collapseExample" aria-expanded="false" aria-controls="collapseExample">\n' + ' <div class="card mt-2">\n' +
' Show error messages\n' + ' <div class="card-header bg-danger">\n' +
' </button>\n' + ' Error Message\n' +
' </p>\n' +
' <div class="collapse" id="collapseExample">\n' +
' <div class="card card-body"><div class="errors"></div>\n' +
' </div>\n' + ' </div>\n' +
' </div></div>'); ' <div class="card-body">\n' +
$.each(data.errormessages, function(index, value) { ' <div class="errors"></div>\n' +
' </div>\n' +
' </div>\n' +
'</div>'
);
$.each(data.errormessages, function (index, value) {
$(".errors").append('<li>' + value); $(".errors").append('<li>' + value);
}); });
} }

24
assets/js/sections/webadif.js
查看文件

@ -35,21 +35,23 @@ function ExportWebADIF(station_id) {
$(".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>'); $(".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 { 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>'); $(".card-body").append('<div class="alert alert-danger" role="alert">' + data.info + '</div>');
} }
if (data.errormessages.length > 0) { if (data.errormessages.length > 0) {
$(".card-body").append('' + $("#adif_import").append(
'<div class="errormessages"><p>\n' + '<div class="errormessages">\n' +
' <button class="btn btn-danger" type="button" data-toggle="collapse" data-target="#collapseExample" aria-expanded="false" aria-controls="collapseExample">\n' + ' <div class="card mt-2">\n' +
' Show error messages\n' + ' <div class="card-header bg-danger">\n' +
' </button>\n' + ' Error Message\n' +
' </p>\n' +
' <div class="collapse" id="collapseExample">\n' +
' <div class="card card-body"><div class="errors"></div>\n' +
' </div>\n' + ' </div>\n' +
' </div></div>'); ' <div class="card-body">\n' +
$.each(data.errormessages, function(index, value) { ' <div class="errors"></div>\n' +
' </div>\n' +
' </div>\n' +
'</div>'
);
$.each(data.errormessages, function (index, value) {
$(".errors").append('<li>' + value); $(".errors").append('<li>' + value);
}); });
} }