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

Merge pull request #3177 from magicbug/dev

浏览代码 
Dev
这个提交包含在：
Peter Goodhall 2024-08-13 15:07:31 +01:00 提交者 GitHub
当前提交 fc0bd2a016
找不到此签名对应的密钥
GPG 密钥 ID: B5690EEEBB952194
共有 6 个文件被更改，包括 45 次插入 和 9 次删除
显示统计信息 下载 Patch 文件 下载 Diff 文件 展开所有文件 折叠所有文件

5
application/models/Logbook_model.php
查看文件

@ -4687,6 +4687,9 @@ class Logbook_model extends CI_Model
function get_lotw_qsos_to_upload($station_id, $start_date, $end_date)
{
// Missing in tqsl 2.7.3 config.xml
$lotw_unsupported_modes = array('INTERNET', 'RPT');
$this->db->select('COL_PRIMARY_KEY,COL_CALL, COL_BAND, COL_BAND_RX, COL_TIME_ON, COL_RST_RCVD, COL_RST_SENT, COL_MODE, COL_SUBMODE, COL_FREQ, COL_FREQ_RX, COL_GRIDSQUARE, COL_SAT_NAME, COL_PROP_MODE, COL_LOTW_QSL_SENT, station_id');
$this->db->where("station_id", $station_id);
@ -4694,7 +4697,7 @@ class Logbook_model extends CI_Model
$this->db->where('COL_LOTW_QSL_SENT', NULL);
$this->db->or_where('COL_LOTW_QSL_SENT !=', "Y");
$this->db->group_end();
$this->db->where('COL_PROP_MODE !=', "INTERNET");
$this->db->where_not_in('COL_PROP_MODE', $lotw_unsupported_modes);
$this->db->where('COL_TIME_ON >=', $start_date);
$this->db->where('COL_TIME_ON <=', $end_date);
$this->db->order_by("COL_TIME_ON", "desc");

12
application/models/Stations.php
查看文件

@ -522,8 +522,16 @@ class Stations extends CI_Model {
$_jsonresult = array();
list($station_lat, $station_lng) = array(0,0);
$station_active = $this->profile($this->find_active())->row();
if (!empty($station_active)) { list($station_lat, $station_lng) = $this->qra->qra2latlong($station_active->station_gridsquare); }
if (($station_lat!=0)&&($station_lng!=0)) { $_jsonresult = array('lat'=>$station_lat,'lng'=>$station_lng,'html'=>$station_active->station_gridsquare,'label'=>$station_active->station_profile_name,'icon'=>'stationIcon'); }
$CI = &get_instance();
$CI->load->library('DxccFlag');
$flag = "";
if (!empty($station_active)) {
$flag = strtolower($CI->dxccflag->getISO($station_active->station_dxcc));
$flag = '<span class="fi fi-' . $flag .'"></span> ';
list($station_lat, $station_lng) = $this->qra->qra2latlong($station_active->station_gridsquare);
}
if (($station_lat!=0)&&($station_lng!=0)) { $_jsonresult = array('lat'=>$station_lat,'lng'=>$station_lng,'html'=>$station_active->station_gridsquare,'label'=>$station_active->station_profile_name,'icon'=>'stationIcon','flag'=>$flag); }
return (count($_jsonresult)>0)?(array('station'=>$_jsonresult)):array();
}
}

4
application/views/lotw_views/adif_views/adif_export.php
查看文件

@ -44,9 +44,9 @@ $cert2 = str_replace("-----END CERTIFICATE-----", "", $cert1);
<MODE:<?php echo strlen($CI->mode_map($qso->COL_MODE, $qso->COL_SUBMODE)); ?>><?php echo strtoupper($CI->mode_map(($qso->COL_MODE == null ? '' : strtoupper($qso->COL_MODE)), ($qso->COL_SUBMODE == null ? '' : strtoupper($qso->COL_SUBMODE)))); ?>
<?php if($qso->COL_FREQ != "" || $qso->COL_FREQ != "0") { ?><?php $freq_in_mhz = $qso->COL_FREQ / 1000000; ?><FREQ:<?php echo strlen($freq_in_mhz); ?>><?php echo $freq_in_mhz; ?><?php } ?>
<?php if($qso->COL_FREQ != "" && $qso->COL_FREQ != "0") { ?><?php $freq_in_mhz = $qso->COL_FREQ / 1000000; ?><FREQ:<?php echo strlen($freq_in_mhz); ?>><?php echo $freq_in_mhz; ?><?php } ?>
<?php if($qso->COL_FREQ_RX != "" || $qso->COL_FREQ_RX != "0") { ?><?php $freq_in_mhz_rx = $qso->COL_FREQ_RX / 1000000; ?><FREQ_RX:<?php echo strlen($freq_in_mhz_rx); ?>><?php echo $freq_in_mhz_rx; ?><?php } ?>
<?php if($qso->COL_FREQ_RX != "" && $qso->COL_FREQ_RX != "0") { ?><?php $freq_in_mhz_rx = $qso->COL_FREQ_RX / 1000000; ?><FREQ_RX:<?php echo strlen($freq_in_mhz_rx); ?>><?php echo $freq_in_mhz_rx; ?><?php } ?>
<?php if($qso->COL_PROP_MODE) { ?><PROP_MODE:<?php echo strlen($qso->COL_PROP_MODE); ?>><?php echo strtoupper($qso->COL_PROP_MODE); ?><?php } ?>

20
application/views/station_profile/edit.php
查看文件

@ -760,6 +760,26 @@
<small id="StateHelp" class="form-text text-muted"><?php echo lang("station_location_state_hint"); ?></small>
</div>
<div class="mb-3" id="netherlands_state">
<label for="stateInput"><?php echo lang("station_location_state"); ?></label>
<select class="form-select" name="station_state" id="StateHelp" aria-describedby="stationCntyInputHelp">
<option value=""></option>
<option value="DR" <?php if($my_station_profile->state == "DR") { echo "selected"; } ?>>Drenthe</option>
<option value="FL" <?php if($my_station_profile->state == "FL") { echo "selected"; } ?>>Flevoland</option>
<option value="FR" <?php if($my_station_profile->state == "FR") { echo "selected"; } ?>>Friesland</option>
<option value="GD" <?php if($my_station_profile->state == "GD") { echo "selected"; } ?>>Gelderland</option>
<option value="GR" <?php if($my_station_profile->state == "GR") { echo "selected"; } ?>>Groningen</option>
<option value="LB" <?php if($my_station_profile->state == "LB") { echo "selected"; } ?>>Limburg</option>
<option value="NB" <?php if($my_station_profile->state == "NB") { echo "selected"; } ?>>Noord-Brabant</option>
<option value="NH" <?php if($my_station_profile->state == "NH") { echo "selected"; } ?>>Noord-Holland</option>
<option value="OV" <?php if($my_station_profile->state == "OV") { echo "selected"; } ?>>Overijssel</option>
<option value="UT" <?php if($my_station_profile->state == "UT") { echo "selected"; } ?>>Utrecht</option>
<option value="ZH" <?php if($my_station_profile->state == "ZH") { echo "selected"; } ?>>Zuid-Holland</option>
<option value="ZL" <?php if($my_station_profile->state == "ZL") { echo "selected"; } ?>>Zeeland</option>
</select>
<small id="StateHelp" class="form-text text-muted"><?php echo lang("station_location_state_hint"); ?></small>
</div>
<!-- US County -->
<div class="mb-3">
<label for="stationCntyInput"><?php echo lang("station_location_county"); ?></label>

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

@ -346,6 +346,10 @@ TD.lotw {
position: absolute !important;
}
.dropdown-menu.menuOnResultTab {
left: -200px;
}
.was-map-dialog .modal-dialog {
width: 100%;
}
@ -796,7 +800,7 @@ label {
}
.table-responsive>table .dropdown{position:static;}
.table-responsive>table .dropdown>.dropdown-menu{left:auto !important;top:auto !important;}
.table-responsive>table .dropdown>.dropdown-menu{left: 75%;top:auto !important;}
tr.htmx-swapping td {
opacity: 0;
@ -805,4 +809,4 @@ tr.htmx-swapping td {
.error-red-border {
border-color: red;
}
}

5
assets/js/sections/station_locations.js
查看文件

@ -40,11 +40,12 @@ $(document).ready( function () {
'170': 'nz_state',
'209': 'belgium_state',
'248': 'italy_state',
'263': 'netherlands_state',
'6': 'us_state' // Alaska
};
// Hide all states initially
$("#canada_state, #aland_state, #asiatic_russia_state, #belarus_state, #mexico_state, #eu_russia_state, #argentina_state, #brazil_state, #chile_state, #us_state, #paraguay_state, #korea_state, #uruguay_state, #venezuela_state, #australia_state, #png_state, #nz_state, #belgium_state, #italy_state").hide();
$("#canada_state, #aland_state, #asiatic_russia_state, #belarus_state, #mexico_state, #eu_russia_state, #argentina_state, #brazil_state, #chile_state, #us_state, #paraguay_state, #korea_state, #uruguay_state, #venezuela_state, #australia_state, #png_state, #nz_state, #belgium_state, #italy_state, #netherlands_state").hide();
/**
* Gets the selected DXCC ID and shows the corresponding state.
*/
@ -68,7 +69,7 @@ $(document).ready( function () {
var stateToShow = stateMap[selectedValue] || stateMap['default'];
// Hide all states
$("#mexico_state, #belarus_state, #asiatic_russia_state, #aland_state, #canada_state, #us_state, #eu_russia_state, #argentina_state, #brazil_state, #chile_state, #paraguay_state, #korea_state, #uruguay_state, #venezuela_state, #australia_state, #png_state, #nz_state, #belgium_state, #italy_state").hide();
$("#mexico_state, #belarus_state, #asiatic_russia_state, #aland_state, #canada_state, #us_state, #eu_russia_state, #argentina_state, #brazil_state, #chile_state, #paraguay_state, #korea_state, #uruguay_state, #venezuela_state, #australia_state, #png_state, #nz_state, #belgium_state, #italy_state, #netherlands_state").hide();
// Show the selected state
$("#" + stateToShow).show();