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

Darn typo / cp-error

Browse Source
This commit is contained in:
int2001
2026-01-14 07:23:30 +00:00
parent 6d4cd84a9d
commit 0972445099
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
application/models/Labels_model.php
View File

@@ -144,6 +144,7 @@ class Labels_model extends CI_Model {
FROM " . $table_name . "
JOIN station_profile ON station_profile.station_id = " . $table_name . ".station_id
JOIN dxcc_entities ON station_profile.station_dxcc = dxcc_entities.adif
JOIN dxcc_entities dxc2 ON ".$table_name.".COL_DXCC = dxc2.adif
WHERE station_profile.user_id = ?
AND COL_QSL_SENT IN ('R', 'Q')";
@@ -157,7 +158,7 @@ class Labels_model extends CI_Model {
$binding[] = $station_id;
}
$sql .= " ORDER BY dxcc_entities.prefix ASC, COL_CALL ASC, COL_SAT_NAME ASC, COL_SAT_MODE ASC, COL_BAND_RX ASC, COL_TIME_ON ASC, COL_MODE ASC";
$sql .= " ORDER BY dxc2.prefix ASC, COL_CALL ASC, COL_SAT_NAME ASC, COL_SAT_MODE ASC, COL_BAND_RX ASC, COL_TIME_ON ASC, COL_MODE ASC";
$query = $this->db->query($sql, $binding);
@@ -172,6 +173,7 @@ class Labels_model extends CI_Model {
FROM " . $table_name . "
JOIN station_profile ON station_profile.station_id = " . $table_name . ".station_id
JOIN dxcc_entities ON station_profile.station_dxcc = dxcc_entities.adif
JOIN dxcc_entities dxc2 ON ".$table_name.".COL_DXCC = dxc2.adif
WHERE station_profile.user_id = ?
AND COL_PRIMARY_KEY IN (";
@@ -179,7 +181,7 @@ class Labels_model extends CI_Model {
$placeholders = array_fill(0, count($ids), '?');
$sql .= implode(',', $placeholders);
$sql .= ") ORDER BY dxcc_entities.prefix ASC, COL_CALL ASC, COL_SAT_NAME ASC, COL_SAT_MODE ASC, COL_BAND_RX ASC, COL_TIME_ON ASC, COL_MODE ASC";
$sql .= ") ORDER BY dxc2.prefix ASC, COL_CALL ASC, COL_SAT_NAME ASC, COL_SAT_MODE ASC, COL_BAND_RX ASC, COL_TIME_ON ASC, COL_MODE ASC";
$binding = array_merge($binding, $ids);