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

Merge branch 'dev' into fady_die_fadefee

Browse Source
This commit is contained in:
int2001
2024-01-31 11:36:35 +00:00
parent 2291e4d0bb 8a905ea967
commit bfff60abdd
3 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
application/controllers/Gridmap.php
View File

@@ -173,7 +173,7 @@ class Gridmap extends CI_Controller {
}
}
$data['grid_2char_confirmed'] = ($array_grid_2char_confirmed);
$data['grid_2char_confirmed'] = ($array_grid_2char_confirmed);
$data['grid_4char_confirmed'] = ($array_grid_4char_confirmed);
$data['grid_6char_confirmed'] = ($array_grid_6char_confirmed);

6
application/models/Gridmap_model.php
View File

@@ -129,6 +129,7 @@ class Gridmap_model extends CI_Model {
return null;
}
$location_list = "'".implode("','",$logbooks_locations_array)."'";
$sql = 'SELECT distinct COL_VUCC_GRIDS, COL_BAND FROM '
@@ -177,7 +178,10 @@ class Gridmap_model extends CI_Model {
$sql .= " or col_qrzcom_qso_download_status = 'Y'";
}
if ($sql != '') {
$sql='and (1=0 '.$sql.')';
$sql=' and (1=0 '.$sql.')';
}
if ($sql == '') {
$sql=' and 1=0';
}
return $sql;
}

4
assets/js/sections/bandmap_list.js
View File

@@ -56,7 +56,7 @@ $(function() {
} else if (single.worked_dxcc) {
dxcc_wked_info="text-warning";
} else {
dxcc_wked_info="";
dxcc_wked_info="text-danger";
}
if (single.cnfmd_call) {
wked_info="text-success";
@@ -86,7 +86,7 @@ $(function() {
spotted=wked_info+lotw_badge;
data[0].push(spotted);
if (single.dxcc_spotted.flag) {
dxcc_wked_info=((dxcc_wked_info != '' ?'<span class="'+dxcc_wked_info+'">' : '')+single.dxcc_spotted.entity+' '+single.dxcc_spotted.flag+(dxcc_wked_info != '' ? '</span>' : ''));
dxcc_wked_info=((dxcc_wked_info != '' ?'<span class="'+dxcc_wked_info+'">' : '')+single.dxcc_spotted.flag+' '+single.dxcc_spotted.entity+(dxcc_wked_info != '' ? '</span>' : ''));
data[0].push('<a href="javascript:spawnLookupModal(\''+single.dxcc_spotted.dxcc_id+'\',\'dxcc\')";>'+dxcc_wked_info+'</a>');
} else {
data[0].push('<a href="javascript:spawnLookupModal(\''+single.dxcc_spotted.dxcc_id+'\',\'dxcc\')";>'+single.dxcc_spotted.entity+'</a>');