From ae552f2dda2e0f8c63abe05ffb4f196dae1a9ec5 Mon Sep 17 00:00:00 2001 From: phl0 Date: Tue, 8 Nov 2022 08:20:59 +0100 Subject: [PATCH 1/5] Also export QSO where MY_SOTA_REF is set --- application/models/Csv_model.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/models/Csv_model.php b/application/models/Csv_model.php index 473a043f..1fd58512 100644 --- a/application/models/Csv_model.php +++ b/application/models/Csv_model.php @@ -23,7 +23,7 @@ class Csv_model extends CI_Model $sql .= "SELECT station_callsign, COL_MY_SOTA_REF, COL_QSO_DATE, COL_TIME_ON, COL_BAND, COL_MODE, COL_CALL, COL_SOTA_REF, COL_COMMENT FROM ".$this->config->item('table_name'). " JOIN station_profile on station_profile.station_id = ".$this->config->item('table_name').".station_id". - " WHERE COL_SOTA_REF <> ''"; + " WHERE COL_SOTA_REF <> '' OR COL_MY_SOTA_REF <> ''"; if ($station_id != "All") { $sql .= ' and ' . $this->config->item('table_name'). '.station_id = ' . $station_id; From e6c889190ab5588239b8a1889624a7b38a8a6893 Mon Sep 17 00:00:00 2001 From: phl0 Date: Tue, 8 Nov 2022 10:35:08 +0100 Subject: [PATCH 2/5] Use commas as seaprators --- application/views/csv/data/export.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/views/csv/data/export.php b/application/views/csv/data/export.php index 4775586f..dba0a1c9 100644 --- a/application/views/csv/data/export.php +++ b/application/views/csv/data/export.php @@ -35,6 +35,6 @@ $bands = array( ); foreach ($qsos as $qso) { $timestamp = strtotime($qso['COL_TIME_ON']); - print "V2;".$qso['station_callsign'].";".$qso['COL_MY_SOTA_REF'].";".date('d/m/y', $timestamp).";".date('Hi', $timestamp).";".$bands[$qso['COL_BAND']].";".$qso['COL_MODE'].";".$qso['COL_CALL'].";".$qso['COL_SOTA_REF'].";".$qso['COL_COMMENT']."\n"; + print "V2,".$qso['station_callsign'].",".$qso['COL_MY_SOTA_REF'].",".date('d/m/y', $timestamp).",".date('Hi', $timestamp).",".$bands[$qso['COL_BAND']].",".$qso['COL_MODE'].",".$qso['COL_CALL'].",".$qso['COL_SOTA_REF'].",".$qso['COL_COMMENT']."\n"; } ?> From 64acb74c3acab4d1e84fa98b4c4a0a4479e90b27 Mon Sep 17 00:00:00 2001 From: phl0 Date: Tue, 8 Nov 2022 10:36:19 +0100 Subject: [PATCH 3/5] Fix typo --- application/views/csv/data/export.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/application/views/csv/data/export.php b/application/views/csv/data/export.php index dba0a1c9..f068d16b 100644 --- a/application/views/csv/data/export.php +++ b/application/views/csv/data/export.php @@ -27,11 +27,11 @@ $bands = array( "6cm" => "5.6GHz", "3cm" => "10GHz", "1.25cm" => "24GHz", - "6mm" => "MIcROWAVE", - "4mm" => "MIcROWAVE", - "2.5mm" => "MIcROWAVE", - "2mm" => "MIcROWAVE", - "1mm" => "MIcROWAVE" + "6mm" => "MICROWAVE", + "4mm" => "MICROWAVE", + "2.5mm" => "MICROWAVE", + "2mm" => "MICROWAVE", + "1mm" => "MICROWAVE" ); foreach ($qsos as $qso) { $timestamp = strtotime($qso['COL_TIME_ON']); From 8e501297960598f1621e1ac08387fa44ef3b7a5d Mon Sep 17 00:00:00 2001 From: phl0 Date: Tue, 8 Nov 2022 10:38:24 +0100 Subject: [PATCH 4/5] Revert "Fix typo" This reverts commit 64acb74c3acab4d1e84fa98b4c4a0a4479e90b27. --- application/views/csv/data/export.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/application/views/csv/data/export.php b/application/views/csv/data/export.php index f068d16b..dba0a1c9 100644 --- a/application/views/csv/data/export.php +++ b/application/views/csv/data/export.php @@ -27,11 +27,11 @@ $bands = array( "6cm" => "5.6GHz", "3cm" => "10GHz", "1.25cm" => "24GHz", - "6mm" => "MICROWAVE", - "4mm" => "MICROWAVE", - "2.5mm" => "MICROWAVE", - "2mm" => "MICROWAVE", - "1mm" => "MICROWAVE" + "6mm" => "MIcROWAVE", + "4mm" => "MIcROWAVE", + "2.5mm" => "MIcROWAVE", + "2mm" => "MIcROWAVE", + "1mm" => "MIcROWAVE" ); foreach ($qsos as $qso) { $timestamp = strtotime($qso['COL_TIME_ON']); From a3c7e6b64f2dc4064981afe7fd0860f10ed315bf Mon Sep 17 00:00:00 2001 From: phl0 Date: Tue, 8 Nov 2022 10:38:33 +0100 Subject: [PATCH 5/5] Revert "Use commas as seaprators" This reverts commit e6c889190ab5588239b8a1889624a7b38a8a6893. --- application/views/csv/data/export.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/views/csv/data/export.php b/application/views/csv/data/export.php index dba0a1c9..4775586f 100644 --- a/application/views/csv/data/export.php +++ b/application/views/csv/data/export.php @@ -35,6 +35,6 @@ $bands = array( ); foreach ($qsos as $qso) { $timestamp = strtotime($qso['COL_TIME_ON']); - print "V2,".$qso['station_callsign'].",".$qso['COL_MY_SOTA_REF'].",".date('d/m/y', $timestamp).",".date('Hi', $timestamp).",".$bands[$qso['COL_BAND']].",".$qso['COL_MODE'].",".$qso['COL_CALL'].",".$qso['COL_SOTA_REF'].",".$qso['COL_COMMENT']."\n"; + print "V2;".$qso['station_callsign'].";".$qso['COL_MY_SOTA_REF'].";".date('d/m/y', $timestamp).";".date('Hi', $timestamp).";".$bands[$qso['COL_BAND']].";".$qso['COL_MODE'].";".$qso['COL_CALL'].";".$qso['COL_SOTA_REF'].";".$qso['COL_COMMENT']."\n"; } ?>