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

[Gridsquare Map] Shows 2,4,6 grids

浏览代码 
Fixes #3136
这个提交包含在：
Peter Goodhall 2024-06-19 14:29:01 +01:00
父节点 df6538afa3
当前提交 ccb9f592b3
共有 2 个文件被更改，包括 8 次插入 和 14 次删除
显示统计信息 下载 Patch 文件 下载 Diff 文件 展开所有文件 折叠所有文件

19
application/controllers/Gridmap.php
查看文件

@ -76,9 +76,7 @@ class Gridmap extends CI_Controller {
foreach ($query->result() as $row) { foreach ($query->result() as $row) {
$grid_2char_confirmed = strtoupper(substr($row->GRID_SQUARES,0,2)); $grid_2char_confirmed = strtoupper(substr($row->GRID_SQUARES,0,2));
$grid_4char_confirmed = strtoupper(substr($row->GRID_SQUARES,0,4)); $grid_4char_confirmed = strtoupper(substr($row->GRID_SQUARES,0,4));
if ($this->config->item('map_6digit_grids')) { $grid_6char_confirmed = strtoupper(substr($row->GRID_SQUARES,0,6));
$grid_6char_confirmed = strtoupper(substr($row->GRID_SQUARES,0,6));
}
// Check if 2 Char is in array // Check if 2 Char is in array
if(!in_array($grid_2char_confirmed, $array_grid_2char_confirmed)){ if(!in_array($grid_2char_confirmed, $array_grid_2char_confirmed)){
@ -89,10 +87,8 @@ class Gridmap extends CI_Controller {
array_push($array_grid_4char_confirmed, $grid_4char_confirmed); array_push($array_grid_4char_confirmed, $grid_4char_confirmed);
} }
if ($this->config->item('map_6digit_grids')) { if(!in_array($grid_6char_confirmed, $array_grid_6char_confirmed)){
if(!in_array($grid_6char_confirmed, $array_grid_6char_confirmed)){
array_push($array_grid_6char_confirmed, $grid_6char_confirmed); array_push($array_grid_6char_confirmed, $grid_6char_confirmed);
}
} }
} }
} }
@ -104,9 +100,7 @@ class Gridmap extends CI_Controller {
$grid_two = strtoupper(substr($row->GRID_SQUARES,0,2)); $grid_two = strtoupper(substr($row->GRID_SQUARES,0,2));
$grid_four = strtoupper(substr($row->GRID_SQUARES,0,4)); $grid_four = strtoupper(substr($row->GRID_SQUARES,0,4));
if ($this->config->item('map_6digit_grids')) { $grid_six = strtoupper(substr($row->GRID_SQUARES,0,6));
$grid_six = strtoupper(substr($row->GRID_SQUARES,0,6));
}
// Check if 2 Char is in array // Check if 2 Char is in array
if(!in_array($grid_two, $array_grid_2char)){ if(!in_array($grid_two, $array_grid_2char)){
@ -117,11 +111,10 @@ class Gridmap extends CI_Controller {
array_push($array_grid_4char, $grid_four); array_push($array_grid_4char, $grid_four);
} }
if ($this->config->item('map_6digit_grids')) { if(!in_array($grid_six, $array_grid_6char)){
if(!in_array($grid_six, $array_grid_6char)){ array_push($array_grid_6char, $grid_six);
array_push($array_grid_6char, $grid_six);
}
} }
} }
} }
$query_vucc = $this->gridmap_model->get_band_worked_vucc_squares($band, $mode, $qsl, $lotw, $eqsl, $qrz, $sat); $query_vucc = $this->gridmap_model->get_band_worked_vucc_squares($band, $mode, $qsl, $lotw, $eqsl, $qrz, $sat);

1
assets/js/sections/gridmap.js
查看文件

@ -55,6 +55,7 @@ function gridPlot(form, visitor=true) {
sat: $("#sats").val(), sat: $("#sats").val(),
}, },
success: function (data) { success: function (data) {
console.log(data);
$('.cohidden').show(); $('.cohidden').show();
$(".ld-ext-right-plot").removeClass('running'); $(".ld-ext-right-plot").removeClass('running');
$(".ld-ext-right-plot").prop('disabled', false); $(".ld-ext-right-plot").prop('disabled', false);