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

finalised gridsquare map code for showing grouped locations

浏览代码
这个提交包含在：
Peter Goodhall 2021-09-08 14:32:48 +01:00
父节点 0322fc1e69
当前提交 3e302f2e5b
共有 2 个文件被更改，包括 73 次插入 和 54 次删除
显示统计信息 下载 Patch 文件 下载 Diff 文件 展开所有文件 折叠所有文件

121
application/models/Gridsquares_model.php
查看文件

@ -10,38 +10,55 @@ class Gridsquares_model extends CI_Model {
function get_worked_sat_squares() { function get_worked_sat_squares() {
$CI =& get_instance(); $CI =& get_instance();
$CI->load->model('Stations'); $CI->load->model('logbooks_model');
$station_id = $CI->Stations->find_active(); $logbooks_locations_array = $CI->logbooks_model->list_logbook_relationships($this->session->userdata('active_station_logbook'));
$this->db->where("station_id", $station_id); $this->db->select('distinct substring(COL_GRIDSQUARE,1,6) as SAT_SQUARE, COL_SAT_NAME', FALSE);
$this->db->where_in('station_id', $logbooks_locations_array);
$this->db->where('COL_GRIDSQUARE !=', '');
$this->db->where('COL_SAT_NAME !=', '');
return $this->db->query('SELECT distinct substring(COL_GRIDSQUARE,1,6) as SAT_SQUARE, COL_SAT_NAME FROM '.$this->config->item('table_name').' WHERE station_id = "'.$station_id.'" AND COL_GRIDSQUARE != "" AND COL_SAT_NAME != ""'); return $this->db->get($this->config->item('table_name'));
} }
function get_confirmed_sat_squares() { function get_confirmed_sat_squares() {
$CI =& get_instance(); $CI =& get_instance();
$CI->load->model('Stations'); $CI->load->model('logbooks_model');
$station_id = $CI->Stations->find_active(); $logbooks_locations_array = $CI->logbooks_model->list_logbook_relationships($this->session->userdata('active_station_logbook'));
return $this->db->query('SELECT distinct substring(COL_GRIDSQUARE,1,6) as SAT_SQUARE, COL_SAT_NAME FROM '.$this->config->item('table_name').' WHERE station_id = "'.$station_id.'" AND COL_GRIDSQUARE != "" AND COL_SAT_NAME != "" AND (COL_LOTW_QSL_RCVD = "Y" OR COL_QSL_RCVD = "Y")'); $this->db->select('distinct substring(COL_GRIDSQUARE,1,6) as SAT_SQUARE, COL_SAT_NAME', FALSE);
$this->db->where_in('station_id', $logbooks_locations_array);
$this->db->where('COL_GRIDSQUARE !=', '');
$this->db->where('COL_SAT_NAME !=', '');
$this->db->where('COL_LOTW_QSL_RCVD', 'Y');
$this->db->or_where('COL_QSL_RCVD', 'Y');
return $this->db->get($this->config->item('table_name'));
} }
function get_confirmed_sat_vucc_squares() { function get_confirmed_sat_vucc_squares() {
$CI =& get_instance(); $CI =& get_instance();
$CI->load->model('Stations'); $CI->load->model('logbooks_model');
$station_id = $CI->Stations->find_active(); $logbooks_locations_array = $CI->logbooks_model->list_logbook_relationships($this->session->userdata('active_station_logbook'));
return $this->db->query('SELECT COL_VUCC_GRIDS, COL_SAT_NAME FROM '.$this->config->item('table_name').' WHERE station_id = "'.$station_id.'" AND COL_VUCC_GRIDS != "" AND COL_SAT_NAME != "" AND (COL_LOTW_QSL_RCVD = "Y" OR COL_QSL_RCVD = "Y") AND (COL_LOTW_QSL_RCVD = "Y" OR COL_QSL_RCVD = "Y")'); $this->db->select('COL_VUCC_GRIDS, COL_SAT_NAME', FALSE);
$this->db->where_in('station_id', $logbooks_locations_array);
$this->db->where('COL_VUCC_GRIDS !=', '');
$this->db->where('COL_SAT_NAME !=', '');
$this->db->where('COL_LOTW_QSL_RCVD', 'Y');
$this->db->or_where('COL_QSL_RCVD', 'Y');
return $this->db->get($this->config->item('table_name'));
} }
function get_worked_sat_vucc_squares() { function get_worked_sat_vucc_squares() {
$CI =& get_instance(); $CI =& get_instance();
$CI->load->model('Stations'); $CI->load->model('logbooks_model');
$station_id = $CI->Stations->find_active(); $logbooks_locations_array = $CI->logbooks_model->list_logbook_relationships($this->session->userdata('active_station_logbook'));
$this->db->select('COL_PRIMARY_KEY, COL_VUCC_GRIDS, COL_SAT_NAME'); $this->db->select('COL_PRIMARY_KEY, COL_VUCC_GRIDS, COL_SAT_NAME', FALSE);
$this->db->where("station_id", $station_id); $this->db->where_in('station_id', $logbooks_locations_array);
$this->db->where('COL_VUCC_GRIDS !=', ""); $this->db->where('COL_VUCC_GRIDS !=', "");
$this->db->where('COL_SAT_NAME !=', ""); $this->db->where('COL_SAT_NAME !=', "");
return $this->db->get($this->config->item('table_name')); return $this->db->get($this->config->item('table_name'));
@ -49,59 +66,61 @@ class Gridsquares_model extends CI_Model {
function get_band($band) { function get_band($band) {
$CI =& get_instance(); $CI =& get_instance();
$CI->load->model('Stations'); $CI->load->model('logbooks_model');
$station_id = $CI->Stations->find_active(); $logbooks_locations_array = $CI->logbooks_model->list_logbook_relationships($this->session->userdata('active_station_logbook'));
$this->db->select('distinct substring(COL_GRIDSQUARE,1,6) as GRID_SQUARES, COL_BAND', FALSE);
$this->db->where_in('station_id', $logbooks_locations_array);
$this->db->where('COL_GRIDSQUARE !=', '');
$sql = 'SELECT distinct substring(COL_GRIDSQUARE,1,6) as GRID_SQUARES, COL_BAND FROM '
.$this->config->item('table_name')
.' WHERE station_id = "'
.$station_id.'" AND COL_GRIDSQUARE != ""';
if ($band != 'All') { if ($band != 'All') {
$sql .= ' AND COL_BAND = "' . $band $this->db->where('COL_BAND', $band);
.'" $this->db->where('COL_PROP_MODE !=', "SAT");
AND COL_PROP_MODE != "SAT" $this->db->where('COL_PROP_MODE !=', "INTERNET");
AND COL_PROP_MODE != "INTERNET" $this->db->where('COL_PROP_MODE !=', "ECH");
AND COL_PROP_MODE != "ECH" $this->db->where('COL_PROP_MODE !=', "RPT");
AND COL_PROP_MODE != "RPT" $this->db->where('COL_SAT_NAME =', "");
AND COL_SAT_NAME = ""';
} }
return $this->db->query($sql); return $this->db->get($this->config->item('table_name'));
} }
function get_band_confirmed($band) { function get_band_confirmed($band) {
$CI =& get_instance(); $CI =& get_instance();
$CI->load->model('Stations'); $CI->load->model('logbooks_model');
$station_id = $CI->Stations->find_active(); $logbooks_locations_array = $CI->logbooks_model->list_logbook_relationships($this->session->userdata('active_station_logbook'));
$this->db->select('distinct substring(COL_GRIDSQUARE,1,6) as GRID_SQUARES, COL_BAND', FALSE);
$this->db->where_in('station_id', $logbooks_locations_array);
$this->db->where('COL_GRIDSQUARE !=', '');
$sql = 'SELECT distinct substring(COL_GRIDSQUARE,1,6) as GRID_SQUARES, COL_BAND FROM '
.$this->config->item('table_name')
.' WHERE station_id = "'
.$station_id.'" AND COL_GRIDSQUARE != ""';
if ($band != 'All') { if ($band != 'All') {
$sql .= ' AND COL_BAND = "' . $band $this->db->where('COL_BAND', $band);
.'" $this->db->where('COL_PROP_MODE !=', "SAT");
AND COL_PROP_MODE != "SAT" $this->db->where('COL_PROP_MODE !=', "INTERNET");
AND COL_PROP_MODE != "INTERNET" $this->db->where('COL_PROP_MODE !=', "ECH");
AND COL_PROP_MODE != "ECH" $this->db->where('COL_PROP_MODE !=', "RPT");
AND COL_PROP_MODE != "RPT" $this->db->where('COL_SAT_NAME =', "");
AND COL_SAT_NAME = ""';
} }
$sql .= ' AND (COL_LOTW_QSL_RCVD = "Y" OR COL_QSL_RCVD = "Y")'; $this->db->where('COL_LOTW_QSL_RCVD', 'Y');
$this->db->or_where('COL_QSL_RCVD', 'Y');
return $this->db->get($this->config->item('table_name'));
return $this->db->query($sql);
} }
function search_band($band, $gridsquare) { function search_band($band, $gridsquare) {
$CI =& get_instance(); $CI =& get_instance();
$CI->load->model('Stations'); $CI->load->model('logbooks_model');
$station_id = $CI->Stations->find_active(); $logbooks_locations_array = $CI->logbooks_model->list_logbook_relationships($this->session->userdata('active_station_logbook'));
$location_list = "'".implode("','",$logbooks_locations_array)."'";
$sql = 'SELECT COL_CALL, COL_TIME_ON, COL_BAND, COL_MODE, COL_GRIDSQUARE, COL_VUCC_GRIDS FROM ' $sql = 'SELECT COL_CALL, COL_TIME_ON, COL_BAND, COL_MODE, COL_GRIDSQUARE, COL_VUCC_GRIDS FROM '
.$this->config->item('table_name') .$this->config->item('table_name')
.' WHERE station_id = "' . $station_id . '" ' .' WHERE station_id IN (' . $location_list . ') '
. ' AND (COL_GRIDSQUARE LIKE "%'.$gridsquare.'%" or COL_VUCC_GRIDS LIKE "%'.$gridsquare.'%")'; . ' AND (COL_GRIDSQUARE LIKE "%'.$gridsquare.'%" or COL_VUCC_GRIDS LIKE "%'.$gridsquare.'%")';
if ($band != 'All') { if ($band != 'All') {
@ -122,12 +141,14 @@ class Gridsquares_model extends CI_Model {
function search_sat($gridsquare) { function search_sat($gridsquare) {
$CI =& get_instance(); $CI =& get_instance();
$CI->load->model('Stations'); $CI->load->model('logbooks_model');
$station_id = $CI->Stations->find_active(); $logbooks_locations_array = $CI->logbooks_model->list_logbook_relationships($this->session->userdata('active_station_logbook'));
$location_list = "'".implode("','",$logbooks_locations_array)."'";
$sql = 'SELECT COL_CALL, COL_TIME_ON, COL_BAND, COL_MODE, COL_SAT_NAME, COL_GRIDSQUARE, COL_VUCC_GRIDS FROM ' . $sql = 'SELECT COL_CALL, COL_TIME_ON, COL_BAND, COL_MODE, COL_SAT_NAME, COL_GRIDSQUARE, COL_VUCC_GRIDS FROM ' .
$this->config->item('table_name'). $this->config->item('table_name').
' WHERE station_id = "'.$station_id. '"' . ' WHERE station_id IN ('.$location_list. ')' .
' AND (COL_GRIDSQUARE LIKE "%'.$gridsquare.'%" or COL_VUCC_GRIDS LIKE "%'.$gridsquare.'%")'. ' AND (COL_GRIDSQUARE LIKE "%'.$gridsquare.'%" or COL_VUCC_GRIDS LIKE "%'.$gridsquare.'%")'.
' AND COL_PROP_MODE = "SAT"'; ' AND COL_PROP_MODE = "SAT"';

4
application/views/gridsquares/index.php
查看文件

@ -26,15 +26,13 @@
<?php if ($this->uri->segment(2) == "satellites") { ?> <?php if ($this->uri->segment(2) == "satellites") { ?>
<div class="alert alert-success" role="alert"> <div class="alert alert-success" role="alert">
Confirmed is Green | Worked but not confirmed is Red Confirmed is Green | Worked but not confirmed is Red
[This grid square map is publically viewable for sharing]
</div> </div>
<?php } ?> <?php } ?>
<?php if ($this->uri->segment(2) == "band") { ?> <?php if ($this->uri->segment(2) == "band") { ?>
<div class="alert alert-success" role="alert"> <div class="alert alert-success" role="alert">
Confirmed is Green | Worked but not confirmed is Red <br> Confirmed is Green | Worked but not confirmed is Red <br>
[This map does not include satellite, internet or repeater QSOs] <br> [This map does not include satellite, internet or repeater QSOs]
[This grid square map is publically viewable for sharing]
</div> </div>
<?php } ?> <?php } ?>
</div> </div>