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

Merge pull request #1135 from AndreasK79/gridsquare_map_popup_change

浏览代码 
[Gridsquare Map popup] Changed so that we use the logbook view in the…
这个提交包含在：
Peter Goodhall 2021-09-14 21:55:21 +01:00 提交者 GitHub
当前提交 55d11e9f7e
找不到此签名对应的密钥
GPG 密钥 ID: 4AEE18F83AFDEB23
共有 1 个文件被更改，包括 33 次插入 和 34 次删除
显示统计信息 下载 Patch 文件 下载 Diff 文件 展开所有文件 折叠所有文件

67
application/views/interface_assets/footer.php
查看文件

@ -811,45 +811,44 @@ $(document).ready(function(){
console.log(map.getZoom());
if(map.getZoom() > 2) {
<?php if ($this->session->userdata('user_callsign')) { ?>
var band = '';
var search_type = "<?php echo $this->uri->segment(2); ?>";
if(search_type == "satellites") {
console.log("satellites search");
var search_tags = "search_sat/" + loc_4char;
band = 'SAT';
} else {
var band = "<?php echo $this->uri->segment(3); ?>";
console.log(band);
var search_tags = "search_band/" + band + "/" + loc_4char;
band = "<?php echo $this->uri->segment(3); ?>";
}
$(".modal-body").empty();
$.ajax({
url: base_url + 'index.php/awards/qso_details_ajax',
type: 'post',
data: {
'Searchphrase': loc_4char,
'Band': band,
'Mode': 'All',
'Type': 'VUCC'
},
success: function (html) {
$(".modal-body").html(html);
$(".modal-body table").addClass('table-sm');
$(".modal-body h5").empty();
var count = $('.table tr').length;
count = count - 1;
$('#qso_count').text(count);
if (count > 1) {
$('#gt1_qso').text("s");
} else {
$('#gt1_qso').text("");
}
$.getJSON( "<?php echo site_url('gridsquares/');?>" + search_tags, function( data ) {
var count = Object.keys(data).length;
console.log("Count: " + count);
var items = [];
$.each( data, function( i, item ) {
console.log(item.COL_CALL + item.COL_SAT_NAME);
if(item.COL_SAT_NAME != undefined) {
items.push( "<tr><td>" + item.COL_TIME_ON + "</td><td>" + item.COL_CALL + "</td><td>" + item.COL_MODE + "</td><td>" + item.COL_SAT_NAME + "</td><td>" + item.COL_GRIDSQUARE + item.COL_VUCC_GRIDS + "</td></tr>" );
} else {
items.push( "<tr><td>" + item.COL_TIME_ON + "</td><td>" + item.COL_CALL + "</td><td>" + item.COL_MODE + "</td><td>" + item.COL_BAND + "</td><td>" + item.COL_GRIDSQUARE + item.COL_VUCC_GRIDS + "</td></tr>" );
}
});
$('#qso_count').text(count);
if (count > 1) {
$('#gt1_qso').text("s");
} else {
$('#gt1_qso').text("");
}
$("#grid_results tbody").empty();
if (count > 0) {
$("#grid_results tbody").append(items.join( "" ));
$('#square_number').text(loc_4char);
$('#exampleModal').modal('show');
}
});
if (count > 0) {
$('#square_number').text(loc_4char);
$('#exampleModal').modal('show');
}
}
});
<?php } ?>
}
};