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

Merge pull request #2475 from int2001/wkd_cnfmd

浏览代码 
Added different colors for worked and confirmed
这个提交包含在：
Peter Goodhall 2023-09-13 15:42:49 +01:00 提交者 GitHub
当前提交 b60fee71f7
找不到此签名对应的密钥
GPG 密钥 ID: 4AEE18F83AFDEB23
共有 6 个文件被更改，包括 274 次插入 和 42 次删除
显示统计信息 下载 Patch 文件 下载 Diff 文件 展开所有文件 折叠所有文件

216
application/controllers/Logbook.php
查看文件

@ -153,6 +153,7 @@ class Logbook extends CI_Controller {
$return['callsign_state'] = $this->nval($callbook['state'] ?? '', $this->logbook_model->call_state($callsign));
$return['callsign_us_county'] = $this->nval($callbook['us_county'] ?? '', $this->logbook_model->call_us_county($callsign));
$return['workedBefore'] = $this->worked_grid_before($return['callsign_qra'], $type, $band, $mode);
$return['confirmed'] = $this->confirmed_grid_before($return['callsign_qra'], $type, $band, $mode);
if ($this->session->userdata('user_show_profile_image')) {
if (isset($callbook)) {
@ -181,7 +182,70 @@ class Logbook extends CI_Controller {
return (($val2 ?? "") === "" ? ($val1 ?? "") : ($val2 ?? ""));
}
function worked_grid_before($gridsquare, $type, $band, $mode)
function confirmed_grid_before($gridsquare, $type, $band, $mode) {
if (strlen($gridsquare) < 4)
return false;
$CI =& get_instance();
$CI->load->model('logbooks_model');
$logbooks_locations_array = $CI->logbooks_model->list_logbook_relationships($this->session->userdata('active_station_logbook'));
$user_gridmap_confirmation = $this->session->userdata('user_gridmap_confirmation');
if(!empty($logbooks_locations_array)) {
$extrawhere='';
if (isset($user_gridmap_confirmation) && strpos($user_gridmap_confirmation, 'Q') !== false) {
$extrawhere="COL_QSL_RCVD='Y'";
}
if (isset($user_gridmap_confirmation) && strpos($user_gridmap_confirmation, 'L') !== false) {
if ($extrawhere!='') {
$extrawhere.=" OR";
}
$extrawhere.=" COL_LOTW_QSL_RCVD='Y'";
}
if (isset($user_gridmap_confirmation) && strpos($user_gridmap_confirmation, 'E') !== false) {
if ($extrawhere!='') {
$extrawherei.=" OR";
}
$extrawhere.=" COL_EQSL_QSL_RCVD='Y'";
}
if($type == "SAT") {
$this->db->where('COL_PROP_MODE', 'SAT');
if ($extrawhere != '') {
$this->db->where('('.$extrawhere.')');
} else {
$this->db->where("1=0");
}
} else {
$CI->load->model('logbook_model');
$this->db->where('COL_MODE', $CI->logbook_model->get_main_mode_from_mode($mode));
$this->db->where('COL_BAND', $band);
$this->db->where('COL_PROP_MODE !=','SAT');
if ($extrawhere != '') {
$this->db->where('('.$extrawhere.')');
} else {
$this->db->where("1=0");
}
}
$this->db->where_in('station_id', $logbooks_locations_array);
$this->db->like('SUBSTRING(COL_GRIDSQUARE, 1, 4)', substr($gridsquare, 0, 4));
$this->db->order_by($this->config->item('table_name').".COL_TIME_ON", "desc");
$this->db->limit(1);
$query = $this->db->get($this->config->item('table_name'));
foreach ($query->result() as $workedBeforeRow) {
return true;
}
}
return false;
}
function worked_grid_before($gridsquare, $type, $band, $mode)
{
if (strlen($gridsquare) < 4)
return false;
@ -226,8 +290,9 @@ class Logbook extends CI_Controller {
function jsonlookupgrid($gridsquare, $type, $band, $mode) {
$return = [
"workedBefore" => false,
"confirmed" => false,
];
$user_gridmap_confirmation = $this->session->userdata('user_gridmap_confirmation');
$CI =& get_instance();
$CI->load->model('logbooks_model');
$logbooks_locations_array = $CI->logbooks_model->list_logbook_relationships($this->session->userdata('active_station_logbook'));
@ -251,6 +316,51 @@ class Logbook extends CI_Controller {
$return['workedBefore'] = true;
}
$extrawhere='';
if (isset($user_gridmap_confirmation) && strpos($user_gridmap_confirmation, 'Q') !== false) {
$extrawhere="COL_QSL_RCVD='Y'";
}
if (isset($user_gridmap_confirmation) && strpos($user_gridmap_confirmation, 'L') !== false) {
if ($extrawhere!='') {
$extrawhere.=" OR";
}
$extrawhere.=" COL_LOTW_QSL_RCVD='Y'";
}
if (isset($user_gridmap_confirmation) && strpos($user_gridmap_confirmation, 'E') !== false) {
if ($extrawhere!='') {
$extrawherei.=" OR";
}
$extrawhere.=" COL_EQSL_QSL_RCVD='Y'";
}
if($type == "SAT") {
$this->db->where('COL_PROP_MODE', 'SAT');
if ($extrawhere != '') {
$this->db->where('('.$extrawhere.')');
} else {
$this->db->where("1=0");
}
} else {
$CI->load->model('logbook_model');
$this->db->where('COL_MODE', $CI->logbook_model->get_main_mode_from_mode($mode));
$this->db->where('COL_BAND', $band);
$this->db->where('COL_PROP_MODE !=','SAT');
if ($extrawhere != '') {
$this->db->where('('.$extrawhere.')');
} else {
$this->db->where("1=0");
}
}
$this->db->where_in('station_id', $logbooks_locations_array);
$this->db->like('SUBSTRING(COL_GRIDSQUARE, 1, 4)', substr($gridsquare, 0, 4));
$query = $this->db->get($this->config->item('table_name'), 1, 0);
foreach ($query->result() as $workedBeforeRow) {
$return['confirmed']=true;
}
header('Content-Type: application/json');
echo json_encode($return, JSON_PRETTY_PRINT);
@ -261,12 +371,14 @@ class Logbook extends CI_Controller {
$return = [
"workedBefore" => false,
"confirmed" => false,
];
$user_gridmap_confirmation = $this->session->userdata('user_gridmap_confirmation');
$CI =& get_instance();
$CI->load->model('logbooks_model');
$logbooks_locations_array = $CI->logbooks_model->list_logbook_relationships($this->session->userdata('active_station_logbook'));
$CI->load->model('logbook_model');
$CI->load->model('logbooks_model');
$logbooks_locations_array = $CI->logbooks_model->list_logbook_relationships($this->session->userdata('active_station_logbook'));
$CI->load->model('logbook_model');
if(!empty($logbooks_locations_array)) {
if($type == "SAT") {
@ -287,12 +399,59 @@ class Logbook extends CI_Controller {
$return['workedBefore'] = true;
}
$extrawhere='';
if (isset($user_gridmap_confirmation) && strpos($user_gridmap_confirmation, 'Q') !== false) {
$extrawhere="COL_QSL_RCVD='Y'";
}
if (isset($user_gridmap_confirmation) && strpos($user_gridmap_confirmation, 'L') !== false) {
if ($extrawhere!='') {
$extrawhere.=" OR";
}
$extrawhere.=" COL_LOTW_QSL_RCVD='Y'";
}
if (isset($user_gridmap_confirmation) && strpos($user_gridmap_confirmation, 'E') !== false) {
if ($extrawhere!='') {
$extrawherei.=" OR";
}
$extrawhere.=" COL_EQSL_QSL_RCVD='Y'";
}
if($type == "SAT") {
$this->db->where('COL_PROP_MODE', 'SAT');
if ($extrawhere != '') {
$this->db->where('('.$extrawhere.')');
} else {
$this->db->where("1=0");
}
} else {
$CI->load->model('logbook_model');
$this->db->where('COL_MODE', $CI->logbook_model->get_main_mode_from_mode($mode));
$this->db->where('COL_BAND', $band);
$this->db->where('COL_PROP_MODE !=','SAT');
if ($extrawhere != '') {
$this->db->where('('.$extrawhere.')');
} else {
$this->db->where("1=0");
}
}
$this->db->where_in('station_id', $logbooks_locations_array);
$this->db->where('COL_COUNTRY', urldecode($country));
$query = $this->db->get($this->config->item('table_name'), 1, 0);
foreach ($query->result() as $workedBeforeRow) {
$return['confirmed']=true;
}
header('Content-Type: application/json');
echo json_encode($return, JSON_PRETTY_PRINT);
return;
} else {
$return['workedBefore'] = false;
$return['confirmed'] = false;
header('Content-Type: application/json');
echo json_encode($return, JSON_PRETTY_PRINT);
@ -307,8 +466,10 @@ class Logbook extends CI_Controller {
$return = [
"workedBefore" => false,
"confirmed" => false,
];
$user_gridmap_confirmation = $this->session->userdata('user_gridmap_confirmation');
$CI =& get_instance();
$CI->load->model('logbooks_model');
$logbooks_locations_array = $CI->logbooks_model->list_logbook_relationships($this->session->userdata('active_station_logbook'));
@ -333,11 +494,56 @@ class Logbook extends CI_Controller {
$return['workedBefore'] = true;
}
$extrawhere='';
if (isset($user_gridmap_confirmation) && strpos($user_gridmap_confirmation, 'Q') !== false) {
$extrawhere="COL_QSL_RCVD='Y'";
}
if (isset($user_gridmap_confirmation) && strpos($user_gridmap_confirmation, 'L') !== false) {
if ($extrawhere!='') {
$extrawhere.=" OR";
}
$extrawhere.=" COL_LOTW_QSL_RCVD='Y'";
}
if (isset($user_gridmap_confirmation) && strpos($user_gridmap_confirmation, 'E') !== false) {
if ($extrawhere!='') {
$extrawherei.=" OR";
}
$extrawhere.=" COL_EQSL_QSL_RCVD='Y'";
}
if($type == "SAT") {
$this->db->where('COL_PROP_MODE', 'SAT');
if ($extrawhere != '') {
$this->db->where('('.$extrawhere.')');
} else {
$this->db->where("1=0");
}
} else {
$CI->load->model('logbook_model');
$this->db->where('COL_MODE', $CI->logbook_model->get_main_mode_from_mode($mode));
$this->db->where('COL_BAND', $band);
$this->db->where('COL_PROP_MODE !=','SAT');
if ($extrawhere != '') {
$this->db->where('('.$extrawhere.')');
} else {
$this->db->where("1=0");
}
}
$this->db->where_in('station_id', $logbooks_locations_array);
$this->db->where('COL_CALL', strtoupper($callsign));
$query = $this->db->get($this->config->item('table_name'), 1, 0);
foreach ($query->result() as $workedBeforeRow) {
$return['confirmed'] = true;
}
header('Content-Type: application/json');
echo json_encode($return, JSON_PRETTY_PRINT);
return;
} else {
$return['workedBefore'] = false;
$return['confirmed'] = false;
header('Content-Type: application/json');
echo json_encode($return, JSON_PRETTY_PRINT);
return;

1
application/language/english/account_lang.php
查看文件

@ -95,3 +95,4 @@ $lang['account_user_mastodon'] = 'URL of Mastodonserver';
$lang['account_gridmap_settings'] = 'Settings for Gridsquare Map';
$lang['account_gridmap_default_band'] = 'Default Band';
$lang['account_qsl_settings'] = 'Default QSL-Method shown in views (Gridsquare and Add-QSO)';

1
application/language/german/account_lang.php
查看文件

@ -95,3 +95,4 @@ $lang['account_user_mastodon'] = 'URL des Mastodonservers';
$lang['account_gridmap_settings'] = 'Einstellung der Planquadratkarte';
$lang['account_gridmap_default_band'] = 'Standardband';
$lang['account_qsl_settings'] = 'QSL-Methoden, die in der Planquadratkarte und beim anlegen eines QSOs angezeigt werden';

5
application/views/user/edit.php
查看文件

@ -562,6 +562,11 @@
} ?>
</select>
</div>
</div>
<div class="card-header">
<?php echo lang('account_qsl_settings'); ?>
</div>
<div class="card-body">
<div class="form-group">
<label class="my-1 mr-2"><?php echo lang('gridsquares_confirmation'); ?></label>
<div class="form-check-inline">

6
assets/css/general.css
查看文件

@ -144,10 +144,14 @@ thead > tr > td {
text-transform: uppercase;
}
.workedGrid {
.confirmedGrid {
border-color: green;
}
.workedGrid {
border-color: yellow;
}
.newGrid {
border-color: red;
border-width: 2px;

87
assets/js/sections/qso.js
查看文件

@ -386,18 +386,20 @@ function changebadge(entityname) {
$.getJSON(base_url + 'index.php/logbook/jsonlookupdxcc/' + convert_case(entityname) + '/SAT/0/0', function(result)
{
$('#callsign_info').removeClass("lotw_info_orange");
$('#callsign_info').removeClass("badge-secondary");
$('#callsign_info').removeClass("badge-success");
$('#callsign_info').removeClass("badge-danger");
$('#callsign_info').attr('title', '');
if (result.workedBefore)
{
if (result.confirmed) {
$('#callsign_info').addClass("badge-success");
$('#callsign_info').attr('title', 'DXCC was already worked and confirmed in the past on this band and mode!');
} else if (result.workedBefore) {
$('#callsign_info').addClass("badge-success");
$('#callsign_info').addClass("lotw_info_orange");
$('#callsign_info').attr('title', 'DXCC was already worked in the past on this band and mode!');
}
else
{
} else {
$('#callsign_info').addClass("badge-danger");
$('#callsign_info').attr('title', 'New DXCC, not worked on this band and mode!');
}
@ -406,18 +408,20 @@ function changebadge(entityname) {
$.getJSON(base_url + 'index.php/logbook/jsonlookupdxcc/' + convert_case(entityname) + '/0/' + $("#band").val() +'/' + $("#mode").val(), function(result)
{
// Reset CSS values before updating
$('#callsign_info').removeClass("lotw_info_orange");
$('#callsign_info').removeClass("badge-secondary");
$('#callsign_info').removeClass("badge-success");
$('#callsign_info').removeClass("badge-danger");
$('#callsign_info').attr('title', '');
if (result.workedBefore)
{
if (result.confirmed) {
$('#callsign_info').addClass("badge-success");
$('#callsign_info').attr('title', 'DXCC was already worked and confirmed in the past on this band and mode!');
} else if (result.workedBefore) {
$('#callsign_info').addClass("badge-success");
$('#callsign_info').addClass("lotw_info_orange");
$('#callsign_info').attr('title', 'DXCC was already worked in the past on this band and mode!');
}
else
{
} else {
$('#callsign_info').addClass("badge-danger");
$('#callsign_info').attr('title', 'New DXCC, not worked on this band and mode!');
}
@ -445,8 +449,10 @@ function reset_fields() {
$('#locator').val("");
$('#iota_ref').val("");
$('#sota_ref').val("");
$("#locator").removeClass("confirmedGrid");
$("#locator").removeClass("workedGrid");
$("#locator").removeClass("newGrid");
$("#callsign").removeClass("confirmedGrid");
$("#callsign").removeClass("workedGrid");
$("#callsign").removeClass("newGrid");
$('#callsign_info').removeClass("badge-secondary");
@ -521,11 +527,14 @@ $("#callsign").focusout(function() {
{
// Reset CSS values before updating
$('#callsign').removeClass("workedGrid");
$('#callsign').removeClass("confirmedGrid");
$('#callsign').removeClass("newGrid");
$('#callsign').attr('title', '');
if (result.workedBefore)
{
if (result.confirmed) {
$('#callsign').addClass("confirmedGrid");
$('#callsign').attr('title', 'Callsign was already worked and confirmed in the past on this band and mode!');
} else if (result.workedBefore) {
$('#callsign').addClass("workedGrid");
$('#callsign').attr('title', 'Callsign was already worked in the past on this band and mode!');
}
@ -539,20 +548,22 @@ $("#callsign").focusout(function() {
$.getJSON(base_url + 'index.php/logbook/jsonlookupcallsign/' + find_callsign.replace(/\//g, "-") + '/0/' + $("#band").val() +'/' + $("#mode").val(), function(result)
{
// Reset CSS values before updating
$('#callsign').removeClass("confirmedGrid");
$('#callsign').removeClass("workedGrid");
$('#callsign').removeClass("newGrid");
$('#callsign').attr('title', '');
if (result.workedBefore)
{
if (result.confirmed) {
$('#callsign').addClass("confirmedGrid");
$('#callsign').attr('title', 'Callsign was already worked and confirmed in the past on this band and mode!');
} else if (result.workedBefore) {
$('#callsign').addClass("workedGrid");
$('#callsign').attr('title', 'Callsign was already worked in the past on this band and mode!');
}
else
{
} else {
$('#callsign').addClass("newGrid");
$('#callsign').attr('title', 'New Callsign!');
}
})
}
@ -632,20 +643,19 @@ $("#callsign").focusout(function() {
if (result.callsign_qra != "")
{
if (result.workedBefore)
{
if (result.confirmed) {
$('#locator').addClass("confirmedGrid");
$('#locator').attr('title', 'Grid was already worked and confirmed in the past');
} else if (result.workedBefore) {
$('#locator').addClass("workedGrid");
$('#locator').attr('title', 'Grid was already worked in the past');
}
else
{
} else {
$('#locator').addClass("newGrid");
$('#locator').attr('title', 'New grid!');
}
}
else
{
} else {
$('#locator').removeClass("workedGrid");
$('#locator').removeClass("confirmedGrid");
$('#locator').removeClass("newGrid");
$('#locator').attr('title', '');
}
@ -773,17 +783,18 @@ $("#locator").keyup(function(){
$.getJSON(base_url + 'index.php/logbook/jsonlookupgrid/' + qra_lookup.toUpperCase() + '/SAT/0/0', function(result)
{
// Reset CSS values before updating
$('#locator').removeClass("confirmedGrid");
$('#locator').removeClass("workedGrid");
$('#locator').removeClass("newGrid");
$('#locator').attr('title', '');
if (result.workedBefore)
{
if (result.confirmed) {
$('#locator').addClass("confirmedGrid");
$('#locator').attr('title', 'Grid was already worked and confirmed in the past');
} else if (result.workedBefore) {
$('#locator').addClass("workedGrid");
$('#locator').attr('title', 'Grid was already worked in the past');
}
else
{
} else {
$('#locator').addClass("newGrid");
$('#locator').attr('title', 'New grid!');
}
@ -792,20 +803,22 @@ $("#locator").keyup(function(){
$.getJSON(base_url + 'index.php/logbook/jsonlookupgrid/' + qra_lookup.toUpperCase() + '/0/' + $("#band").val() +'/' + $("#mode").val(), function(result)
{
// Reset CSS values before updating
$('#locator').removeClass("confirmedGrid");
$('#locator').removeClass("workedGrid");
$('#locator').removeClass("newGrid");
$('#locator').attr('title', '');
if (result.workedBefore)
{
if (result.confirmed) {
$('#locator').addClass("confirmedGrid");
$('#locator').attr('title', 'Grid was already worked and confimred in the past');
} else if (result.workedBefore) {
$('#locator').addClass("workedGrid");
$('#locator').attr('title', 'Grid was already worked in the past');
}
else
{
} else {
$('#locator').addClass("newGrid");
$('#locator').attr('title', 'New grid!');
}
})
}
}
@ -954,8 +967,10 @@ function resetDefaultQSOFields() {
$('#iota_ref').val("");
$('#sota_ref').val("");
$("#locator").removeClass("workedGrid");
$("#locator").removeClass("confirmedGrid");
$("#locator").removeClass("newGrid");
$("#callsign").removeClass("workedGrid");
$("#callsign").removeClass("confirmedGrid");
$("#callsign").removeClass("newGrid");
$('#callsign_info').removeClass("badge-secondary");
$('#callsign_info').removeClass("badge-success");