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 maintenance_cron

Browse Source
This commit is contained in:
HB9HIL
2024-02-27 21:02:55 +01:00
committed by GitHub
parent fbe5411251 476ab9c03b
commit 32dc558bb9
2 changed files with 5 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
application/models/Jcc_model.php
View File

@@ -824,8 +824,6 @@ class Jcc_model extends CI_Model {
'4715' => 'Nanjo',
);
public $jccString = '0101,0102,0103,0104,0105,0106,0107,0108,0109,0110,0111,0112,0113,0114,0115,0116,0117,0118,0119,0120,0121,0122,0123,0124,0125,0126,0127,0128,0129,0130,0131,0133,0134,0135,0136,0201,0202,0203,0204,0205,0206,0207,0208,0209,0210,0301,0302,0303,0304,0305,0307,0308,0309,0310,0311,0313,0314,0315,0316,0401,0402,0403,0404,0406,0407,0409,0410,0411,0412,0413,0414,0415,0501,0502,0503,0504,0505,0506,0507,0508,0509,0510,0511,0512,0513,0601,0602,0603,0605,0606,0607,0608,0609,0611,0612,0613,0614,0615,0616,0701,0702,0703,0705,0707,0708,0711,0714,0715,0717,0718,0719,0720,0801,0802,0804,0805,0806,0808,0809,0810,0811,0812,0813,0816,0818,0822,0823,0824,0825,0826,0827,0828,0901,0902,0903,0904,0905,0906,0907,0908,0909,0910,0911,0912,0913,0914,0915,0918,0919,0920,0921,100101,100102,100103,100104,100105,100106,100107,100108,100109,100110,100111,100112,100113,100114,100115,100116,100117,100118,100119,100120,100121,100122,100123,1002,1003,1004,1005,1006,1007,1008,1009,1010,1011,1012,1013,1014,1015,1016,1019,1020,1021,1022,1023,1024,1025,1026,1028,1029,1030,1101,1102,1103,1104,1105,1106,1107,1108,1109,1110,1111,1112,1113,1114,1115,1116,1117,1118,1119,1201,1202,1203,1204,1205,1206,1207,1208,1210,1211,1212,1213,1215,1216,1217,1218,1219,1220,1221,1222,1223,1224,1225,1226,1227,1228,1229,1230,1231,1232,1233,1234,1235,1236,1237,1238,1239,1302,1303,1304,1306,1307,1308,1309,1310,1311,1312,1314,1315,1316,1317,1318,1319,1321,1322,1323,1324,1325,1327,1328,1329,1330,1331,1332,1333,1334,1336,1337,1338,1339,1340,1341,1342,1343,1344,1345,1346,1401,1402,1403,1404,1405,1407,1408,1410,1412,1414,1415,1416,1417,1419,1420,1421,1422,1423,1424,1425,1426,1427,1428,1429,1430,1431,1432,1433,1434,1435,1436,1437,1501,1502,1503,1504,1505,1506,1508,1509,1510,1511,1513,1514,1515,1516,1601,1602,1603,1604,1605,1606,1607,1608,1609,1610,1611,1612,1701,1702,1704,1705,1706,1707,1708,1709,1710,1711,1712,1713,1714,1801,1802,1803,1805,1806,1807,1808,1809,1811,1812,1813,1814,1815,1816,1817,1820,1821,1822,1823,1824,1825,1826,1827,1901,1902,1903,1904,1905,1906,1907,1908,1909,1910,1911,1912,1913,1914,1915,1916,1917,1918,1919,1920,1921,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017,2019,2021,2022,2023,2024,2025,2026,2027,2028,2029,2030,2031,2032,2033,2034,2035,2036,2037,2038,2039,2040,2101,2102,2103,2104,2105,2107,2108,2109,2110,2111,2112,2115,2116,2117,2201,2202,2203,2204,2205,2206,2207,2208,2209,2210,2211,2212,2213,2214,2215,2301,2302,2303,2304,2306,2307,2308,2309,2310,2311,2312,2313,2314,2401,2402,2403,2404,2405,2406,2407,2408,2409,2410,2411,2412,2501,2502,2503,2504,2506,2507,2508,2509,2510,2511,2512,2513,2514,2515,2516,2517,2518,2521,2522,2523,2524,2525,2526,2527,2528,2529,2530,2531,2532,2533,2534,2535,2536,2601,2602,2603,2604,2605,2606,2607,2608,2609,2701,2702,2703,2704,2705,2706,2707,2708,2709,2710,2711,2713,2714,2715,2716,2717,2718,2719,2720,2721,2723,2724,2725,2726,2727,2728,2729,2730,2731,2801,2802,2804,2805,2806,2807,2808,2809,2810,2811,2901,2902,2904,2905,2906,2907,2908,2909,2910,3001,3002,3003,3004,3005,3006,3007,3009,3010,3011,3012,3101,3102,3103,3104,3107,3109,3110,3111,3112,3113,3114,3115,3116,3117,3118,3201,3202,3203,3204,3205,3206,3207,3209,3301,3302,3303,3304,3306,3307,3308,3310,3311,3312,3313,3315,3316,3401,3402,3403,3404,3501,3502,3503,3504,3505,3508,3509,3510,3511,3512,3513,3514,3515,3516,3601,3602,3603,3604,3605,3606,3607,3608,3701,3702,3703,3704,3705,3706,3707,3708,3801,3802,3803,3804,3805,3806,3807,3810,3813,3814,3815,3901,3902,3903,3904,3905,3907,3908,3909,3910,3911,3912,4001,4007,4008,4009,4010,4011,4012,4015,4016,4017,4018,4019,4020,4021,4022,4023,4024,4025,4026,4027,4029,4030,4031,4032,4033,4034,4035,4036,4037,4101,4102,4103,4104,4105,4106,4107,4108,4109,4110,4201,4202,4203,4204,4205,4207,4208,4209,4210,4211,4212,4213,4214,4301,4302,4303,4304,4305,4306,4308,4310,4311,4312,4313,4314,4315,4316,4401,4402,4403,4404,4405,4406,4407,4408,4410,4411,4412,4413,4414,4415,4501,4502,4503,4504,4505,4506,4507,4508,4509,4601,4603,4604,4606,4607,4610,4614,4615,4616,4617,4618,4619,4620,4621,4622,4623,4624,4625,4626,4701,4704,4706,4708,4709,4710,4711,4712,4713,4714,4715';
function get_jcc_array($bands, $postdata) {
$CI =& get_instance();
$CI->load->model('logbooks_model');
@@ -837,7 +835,7 @@ class Jcc_model extends CI_Model {
$location_list = "'".implode("','",$logbooks_locations_array)."'";
$jccArray = explode(',', $this->jccString);
$jccArray = array_keys($this->jaCities);
$cities = array(); // Used for keeping track of which cities that are not worked
foreach ($jccArray as $city) { // Generating array for use in the table
@@ -924,8 +922,6 @@ class Jcc_model extends CI_Model {
$sql .= " and dxcc_entities.end is null";
}
$sql .= $this->addContinentsToQuery($postdata);
$query = $this->db->query($sql);
return $query->result();
@@ -951,8 +947,6 @@ class Jcc_model extends CI_Model {
$sql .= " and dxcc_entities.end is null";
}
$sql .= $this->addContinentsToQuery($postdata);
$query = $this->db->query($sql);
return $query->result();
@@ -1131,8 +1125,8 @@ class Jcc_model extends CI_Model {
function addStateToQuery() {
$sql = '';
$sql .= " and COL_DXCC in ('339')";
$sql .= " and (COL_CNTY LIKE '____' OR COL_CNTY LIKE '______')";
$sql .= " and COL_CNTY in ($this->jccString)";
$sql .= " and (COL_CNTY LIKE '____' OR COL_CNTY LIKE '10____')";
$sql .= " and COL_CNTY in (".implode(',', array_keys($this->jaCities)).")";
return $sql;
}
}

10
application/models/Waja.php
View File

@@ -55,8 +55,6 @@ class WAJA extends CI_Model {
'46' => 'Kagoshima',
'47' => 'Okinawa');
public $prefectureString = '01,02,03,04,05,06,07,08,09,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47';
function get_waja_array($bands, $postdata) {
$CI =& get_instance();
$CI->load->model('logbooks_model');
@@ -68,7 +66,7 @@ class WAJA extends CI_Model {
$location_list = "'".implode("','",$logbooks_locations_array)."'";
$wajaArray = explode(',', $this->prefectureString);
$wajaArray = array_keys($this->jaPrefectures);
$prefectures = array(); // Used for keeping track of which states that are not worked
foreach ($wajaArray as $state) { // Generating array for use in the table
@@ -155,8 +153,6 @@ class WAJA extends CI_Model {
$sql .= " and dxcc_entities.end is null";
}
$sql .= $this->addContinentsToQuery($postdata);
$query = $this->db->query($sql);
return $query->result();
@@ -182,8 +178,6 @@ class WAJA extends CI_Model {
$sql .= " and dxcc_entities.end is null";
}
$sql .= $this->addContinentsToQuery($postdata);
$query = $this->db->query($sql);
return $query->result();
@@ -353,7 +347,7 @@ class WAJA extends CI_Model {
function addStateToQuery() {
$sql = '';
$sql .= " and COL_DXCC in ('339')";
$sql .= " and COL_STATE in ($this->prefectureString)";
$sql .= " and COL_STATE in (".implode(',', array_keys($this->jaPrefectures)).")";
return $sql;
}
}