Public_Tools/wavelog
2
0
Fork 0
mirror of https://github.com/wavelog/wavelog.git synced 2026-03-22 10:24:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Implement table results view for activated grids

Browse Source
This commit is contained in:
phl0
2022-02-06 16:17:21 +01:00
parent 1fadec7e7b
commit 5afdbda357
4 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
application/models/Activated_grids_model.php
View File

@@ -12,7 +12,7 @@ class Activated_grids_model extends CI_Model {
}
$this->db->select('distinct substring(COL_MY_GRIDSQUARE,1,6) as SAT_SQUARE, COL_SAT_NAME', FALSE);
// $this->db->where_in('station_id', $logbooks_locations_array);
$this->db->where_in('station_id', $logbooks_locations_array);
$this->db->where('COL_MY_GRIDSQUARE !=', '');
$this->db->where('COL_SAT_NAME !=', '');
@@ -32,8 +32,7 @@ class Activated_grids_model extends CI_Model {
$sql = 'SELECT distinct substring(COL_MY_GRIDSQUARE,1,6) as SAT_SQUARE, COL_SAT_NAME FROM '
. $this->config->item('table_name')
. ' WHERE COL_MY_GRIDSQUARE != "" AND COL_SAT_NAME != "" AND (COL_LOTW_QSL_SENT = "Y" OR COL_QSL_SENT = "Y")';
// . ' WHERE station_id in (' . $location_list . ') AND COL_MY_GRIDSQUARE != "" AND COL_SAT_NAME != "" AND (COL_LOTW_QSL_SENT = "Y" OR COL_QSL_SENT = "Y")';
. ' WHERE station_id in (' . $location_list . ') AND COL_MY_GRIDSQUARE != "" AND COL_SAT_NAME != "" AND (COL_LOTW_QSL_SENT = "Y" OR COL_QSL_SENT = "Y")';
return $this->db->query($sql);
}
@@ -82,9 +81,9 @@ class Activated_grids_model extends CI_Model {
return null;
}
$this->db->select('distinct substring(COL_GRIDSQUARE,1,6) as GRID_SQUARES, COL_BAND', FALSE);
$this->db->select('distinct substring(COL_MY_GRIDSQUARE,1,6) as GRID_SQUARES, COL_BAND', FALSE);
$this->db->where_in('station_id', $logbooks_locations_array);
$this->db->where('COL_GRIDSQUARE !=', '');
$this->db->where('COL_MY_GRIDSQUARE !=', '');
if ($band != 'All') {
$this->db->where('COL_BAND', $band);
@@ -109,10 +108,10 @@ class Activated_grids_model extends CI_Model {
$location_list = "'".implode("','",$logbooks_locations_array)."'";
$sql = 'SELECT distinct substring(COL_GRIDSQUARE,1,6) as GRID_SQUARES, COL_BAND FROM '
$sql = 'SELECT distinct substring(COL_MY_GRIDSQUARE,1,6) as GRID_SQUARES, COL_BAND FROM '
.$this->config->item('table_name')
.' WHERE station_id in ('
.$location_list.') AND COL_GRIDSQUARE != ""';
.$location_list.') AND COL_MY_GRIDSQUARE != ""';
if ($band != 'All') {
$sql .= ' AND COL_BAND = "' . $band
.'"
@@ -123,7 +122,7 @@ class Activated_grids_model extends CI_Model {
AND COL_SAT_NAME = ""';
}
$sql .= ' AND (COL_LOTW_QSL_RCVD = "Y" OR COL_QSL_RCVD = "Y")';
$sql .= ' AND (COL_LOTW_QSL_SENT = "Y" OR COL_QSL_SENT = "Y")';
return $this->db->query($sql);
}
@@ -138,7 +137,7 @@ class Activated_grids_model extends CI_Model {
$sql = 'SELECT COL_CALL, COL_TIME_ON, COL_BAND, COL_MODE, COL_GRIDSQUARE, COL_VUCC_GRIDS FROM '
.$this->config->item('table_name')
.' WHERE station_id IN (' . $location_list . ') '
. ' AND (COL_GRIDSQUARE LIKE "%'.$gridsquare.'%" or COL_VUCC_GRIDS LIKE "%'.$gridsquare.'%")';
. ' AND (COL_MY_GRIDSQUARE LIKE "%'.$gridsquare.'%")';
if ($band != 'All') {
$sql .= ' AND COL_BAND = "' . $band
@@ -166,7 +165,7 @@ class Activated_grids_model extends CI_Model {
$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').
' WHERE station_id IN ('.$location_list. ')' .
' AND (COL_GRIDSQUARE LIKE "%'.$gridsquare.'%" or COL_VUCC_GRIDS LIKE "%'.$gridsquare.'%")'.
' AND (COL_MY_GRIDSQUARE LIKE "%'.$gridsquare.'%")'.
' AND COL_PROP_MODE = "SAT"';
$result = $this->db->query($sql);

3
application/models/Logbook_model.php
View File

@@ -270,6 +270,9 @@ class Logbook_model extends CI_Model {
case 'VUCC':
$this->db->where("(COL_GRIDSQUARE like '%" . $searchphrase . "%' OR COL_VUCC_GRIDS like'%" . $searchphrase ."%')");
break;
case 'GridActivator':
$this->db->where("(COL_MY_GRIDSQUARE like '%" . $searchphrase . "%')");
break;
case 'CQZone':
$this->db->where('COL_CQZ', $searchphrase);
break;

2
application/views/activated_grids/index.php
View File

@@ -41,7 +41,7 @@
<div class="modal-dialog modal-xl" role="document">
<div class="modal-content">
<div class="modal-header">
<h5 class="modal-title" id="exampleModalLabel"><span id="qso_count"></span> QSO<span id="gt1_qso"></span> in Square: <span id="square_number"></span></h5>
<h5 class="modal-title" id="exampleModalLabel"><span id="qso_count"></span> QSO<span id="gt1_qso"></span> from Square: <span id="square_number"></span></h5>
<button type="button" class="close" data-dismiss="modal" aria-label="Close">
<span aria-hidden="true">&times;</span>
</button>

2
application/views/interface_assets/footer.php
View File

@@ -1232,7 +1232,7 @@ $(document).ready(function(){
'Searchphrase': loc_4char,
'Band': band,
'Mode': 'All',
'Type': 'VUCC'
'Type': 'GridActivator'
},
success: function (html) {
$(".modal-body").html(html);