ADIF fields inclusion

Author: d

src/Changelog

@@ -1,41 +1,3 @@
-DONE: altitude
-DONE: my_altitude
-gridsquare_ext
-my_gridsquare_ext
-hamlogeu_qso_upload_date
-WIP: hamlogeu_qso_upload_status
-hamqth_qso_upload_date
-WIP: hamqth_qso_upload_status
-my_arrl_sect
-my_pota_ref
-my_wwff_ref
-pota_ref
-wwff_ref
-
-
-
-ADDRESS_INTL
-COMMENT_INTL
-COUNTRY_INTL
-MY_ANTENNA_INTL
-MY_CITY_INTL
-MY_COUNTRY_INTL
-MY_NAME_INTL
-MY_POSTAL_CODE_INTL
-MY_RIG_INTL
-MY_SIG_INTL
-MY_SIG_INFO_INTL
-MY_STREET_INTL
-NAME_INTL
-NOTES_INTL
-QSLMSG_INTL
-QTH_INTL
-RIG_INTL
-SIG_INTL
-SIG_INFO_INTL
-
-
-BUG: Detect the need to update the DB https://github.com/ea4k/klog/issues/721
 BUG: When entering/modifying a QSO thre is an error related to awarddxcc table not existing
 
 TODO: Update the DB (modes table) updateToLatest() => updateTo026
@@ -59,10 +21,7 @@ TESTS to do during RC releases:
     - check if they are properly imported to the log.
     - Test a dupe QSO, a message should be shown
 
-TEST
-WIP:  #396, #507, #508 (User selectable fields: my_pota_ref, my_sig, my_sig_info, my_wwff_ref)
-WIP:  #396, #507, #508 (User selectable fields: pota_ref, sig, sig_info, wwff_ref)
-
+Close:  #396, #507, #508
 
 
 TBD - 2.4
@@ -75,6 +34,7 @@ TBD - 2.4
 - Enhancement: Added all the modes/submodes of ADIF 3.1.4
 - Enhancement: Added many tests to test code before releasing.
 - Enhancement: ADIF Added SUBMM band.
+- Enhancement: Added several ADIF fields (Closes #396, #507, #508, #719)
 - BugFix: Fixed the ISO name for Togo.
 - BugFix: Country fix read failed with complex prefixes.
 - Bugfix: CQ & ITU zones may be wrong for callsigns from specific DXCC if coming from WSJTX.

src/adif.cpp

@@ -368,6 +368,32 @@ bool Adif::isValidQSO_COMPLETE(const QString &_s)
     return ((_s == "Y") || (_s == "N") || (_s == "NIL") || (_s == "?"));
 }
 
+QString Adif::getQSO_COMPLETEFromDB(const QString &_s)
+{// Returns the ADIF QSO_COMPLETE
+    //1=Y, 2=N, 3=NIL, 4=?
+    //qDebug() << Q_FUNC_INFO << ": " << _s;
+    int i = _s.toInt();
+    switch (i)
+    {
+    case 2:
+    {
+        return "N";
+    }
+    case 3:
+    {
+        return "NIL";
+    }
+    case 4:
+    {
+        return "?";
+    }
+    default:
+    {
+        return "Y";
+    }
+    }
+}
+
 bool Adif::isValidPOTA(const QString &_s)
 {
     if (_s.length()<1)
@@ -382,6 +408,8 @@ bool Adif::isValidWWFF_Ref(const QString &_s)
     return true;
 }
 
+
+
 /*
 bool Utilities::isValidComment(const QString &_b)
 {

src/adif.h

@@ -37,6 +37,7 @@
 #include <QString>
 #include <QtDebug>
 #include <QStringList>
+
 //#include "locator.h"
 #include "klogdefinitions.h"
 
@@ -71,7 +72,8 @@ class Adif : public QObject {
     bool isValidTenTen(const QString &_b);            //>0
     bool isValidLogId(const QString &_b);            //>0
     bool isValidAntPath(const QString &_s);
-    bool isValidQSO_COMPLETE(const QString &_s);    // "Y", "N", "NIL", "?"
+    bool isValidQSO_COMPLETE(const QString &_s);        // "Y", "N", "NIL", "?"
+    QString getQSO_COMPLETEFromDB(const QString &_s);    // Translates the DB value into an ADIF value
     bool isValidPOTA(const QString &_s);            // TODO
     bool isValidWWFF_Ref(const QString &_s);        // TODO
 

src/charts/statsdxccsonsatswidget.h

@@ -1,5 +1,5 @@
-#ifndef CHARTS_KLOG_STATSDXCCSONSATSWIDGET_H
-#define CHARTS_KLOG_STATSDXCCSONSATSWIDGET_H
+#ifndef KLOG_CHARTS_STATSDXCCSONSATSWIDGET_H
+#define KLOG_CHARTS_STATSDXCCSONSATSWIDGET_H
 /***************************************************************************
                           statsdxccsonsatswidget.h  -  description
                              -------------------

src/database.cpp

@@ -456,11 +456,7 @@ bool DataBase::createTableLog(bool temp)
              "ituz INTEGER, "
              "dxcc INTEGER, "
              "address VARCHAR, "
-             "address_intl VARCHAR, "
              "age INTEGER, "
-             "cnty VARCHAR, "
-             "comment VARCHAR, "
-             "comment_intl VARCHAR, "
              "a_index INTEGER, "
              "altitude REAL, "
              "ant_az INTEGER, "
@@ -474,11 +470,12 @@ bool DataBase::createTableLog(bool temp)
              "class VARCHAR, "
              "clublog_qso_upload_date DATETIME, "
              "clublog_qso_upload_status VARCHAR(1), "
+             "cnty VARCHAR, "
+             "comment VARCHAR, "
              "cont VARCHAR(2), "
              "contacted_op VARCHAR(40), "
              "contest_id VARCHAR, "
              "country VARCHAR, "
-             "country_intl VARCHAR, "
              "credit_submitted VARCHAR, "
              "credit_granted VARCHAR, "
              "darc_dok VARCHAR,"
@@ -501,7 +498,7 @@ bool DataBase::createTableLog(bool temp)
              "hamqth_qso_upload_date DATETIME, "
              "hamqth_qso_upload_status VARCHAR(1), "
              "hrdlog_qso_upload_date DATETIME, "
-             "hrdlog_qso_upload_status  VARCHAR(1), "
+             "hrdlog_qso_upload_status VARCHAR(1), "
              "iota VARCHAR(6), "
              "iota_island_id VARCHAR, "
              "k_index INTEGER, "
@@ -515,13 +512,10 @@ bool DataBase::createTableLog(bool temp)
              "ms_shower VARCHAR, "
              "my_altitude REAL, "
              "my_antenna VARCHAR, "
-             "my_antenna_intl VARCHAR, "
              "my_arrl_sect VARCHAR(3), "
              "my_city VARCHAR, "
-             "my_city_intl VARCHAR, "
              "my_cnty VARCHAR, "
              "my_country INTEGER, "
-             "my_country_intl INTEGER, "
              "my_cq_zone INTEGER, "
              "my_dxcc INTEGER, "
              "my_fists INTEGER, "
@@ -533,16 +527,11 @@ bool DataBase::createTableLog(bool temp)
              "my_lat VARCHAR(11), "
              "my_lon VARCHAR(11), "
              "my_name VARCHAR, "
-             "my_name_intl VARCHAR, "
              "my_pota_ref VARCHAR, "
              "my_postal_code VARCHAR ,"
-             "my_postal_code_intl VARCHAR ,"
              "my_rig VARCHAR, "
-             "my_rig_intl VARCHAR, "
              "my_sig VARCHAR, "
-             "my_sig_intl VARCHAR, "
              "my_sig_info VARCHAR, "
-             "my_sig_info_intl VARCHAR, "
              "my_sota_ref VARCHAR, "
              "my_state VARCHAR, "
              "my_street VARCHAR, "
@@ -551,7 +540,6 @@ bool DataBase::createTableLog(bool temp)
              "my_wwff_ref VARCHAR(11), "
              "name VARCHAR, "
              "notes VARCHAR, "
-             "notes_intl VARCHAR, "
              "nr_bursts INTEGER, "
              "nr_pings INTEGER, "
              "operator VARCHAR, "
@@ -564,7 +552,6 @@ bool DataBase::createTableLog(bool temp)
              "qrzcom_qso_upload_date DATETIME, "
              "qrzcom_qso_upload_status VARCHAR(1), "
              "qslmsg VARCHAR, "
-             "qslmsg_intl VARCHAR, "
              "qslrdate DATETIME, "
              "qslsdate DATETIME, "
              "qsl_rcvd VARCHAR(1), "
@@ -575,18 +562,14 @@ bool DataBase::createTableLog(bool temp)
              "qso_complete VARCHAR(1), "
              "qso_random INTEGER, "
              "qth VARCHAR, "
-             "qth_intl VARCHAR, "
              "region VARCHAR, "
              "rig VARCHAR, "
-             "rig_intl VARCHAR, "
              "rx_pwr REAL, "
              "sat_mode VARCHAR, "
              "sat_name VARCHAR, "
              "sfi INTEGER, "
              "sig VARCHAR, "
-             "sig_intl VARCHAR, "
              "sig_info VARCHAR, "
-             "sig_info_intl VARCHAR, "
              "silent_key VARCHAR(1), "
              "skcc VARCHAR, "
              "sota_ref VARCHAR, "
@@ -596,14 +579,14 @@ bool DataBase::createTableLog(bool temp)
              "stx VARCHAR(10), "
              "state VARCHAR, "
              "station_callsign VARCHAR, "
-             "submode VARCHAR,"
+             "submode VARCHAR, "
              "swl INTEGER, "
+             "ten_ten INTEGER, "
+             "tx_pwr REAL, "
              "uksmg INTEGER, "
              "usaca_counties VARCHAR, "
              "ve_prov VARCHAR, "
              "vucc_grids VARCHAR, "
-             "ten_ten INTEGER, "
-             "tx_pwr REAL, "
              "web VARCHAR, "
              "wwff_ref VARCHAR(11), "
              "qso_date_off DATETIME, " //2020-01-01

src/database/db_adif_primary_subdvisions_data.h

@@ -1,6 +1,39 @@
-#ifndef DB_ADIF_PRIMARY_SUBDVISIONS_DATA_H
-#define DB_ADIF_PRIMARY_SUBDVISIONS_DATA_H
+    #ifndef KLOG_DATABASE_DB_ADIF_PRIMARY_SUBDVISIONS_DATA_H
+#define KLOG_DATABASE_DB_ADIF_PRIMARY_SUBDVISIONS_DATA_H
+/***************************************************************************
+                          db_adif_primary_subdivisions_data.h  -  description
+                             -------------------
+    begin                : Apr 2024
+    copyright            : (C) 2024 by Jaime Robles
+    email                : [email protected]
+ ***************************************************************************/
 
+/*****************************************************************************
+ * This file is part of KLog.                                                *
+ *                                                                           *
+ *    KLog is free software: you can redistribute it and/or modify           *
+ *    it under the terms of the GNU General Public License as published by   *
+ *    the Free Software Foundation, either version 3 of the License, or      *
+ *    (at your option) any later version.                                    *
+ *                                                                           *
+ *    KLog is distributed in the hope that it will be useful,                *
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of         *
+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the          *
+ *    GNU General Public License for more details.                           *
+ *                                                                           *
+ *    You should have received a copy of the GNU General Public License      *
+ *    along with KLog.  If not, see <https://www.gnu.org/licenses/>.         *
+ *                                                                           *
+ *****************************************************************************/
+/*
+    This class contains the data of the Primary Subdivisions of ADIF as listed
+    here:
+    https://www.adif.org/314/ADIF_314.htm#Primary_Administrative_Subdivision
+
+    This class exists just to have one single place to maintain any ADIF
+    modification in the future.
+
+*/
 #include <QObject>
 #include "queryexecutor.h"
 

src/database/queryexecutor.h

@@ -1,5 +1,35 @@
-#ifndef QUERYEXECUTOR_H
-#define QUERYEXECUTOR_H
+#ifndef KLOG_DATABASE_QUERYEXECUTOR_H
+#define KLOG_DATABASE_QUERYEXECUTOR_H
+/***************************************************************************
+                          queryexecutor.h  -  description
+                             -------------------
+    begin                : Apr 2024
+    copyright            : (C) 2024 by Jaime Robles
+    email                : [email protected]
+ ***************************************************************************/
+
+/*****************************************************************************
+ * This file is part of KLog.                                                *
+ *                                                                           *
+ *    KLog is free software: you can redistribute it and/or modify           *
+ *    it under the terms of the GNU General Public License as published by   *
+ *    the Free Software Foundation, either version 3 of the License, or      *
+ *    (at your option) any later version.                                    *
+ *                                                                           *
+ *    KLog is distributed in the hope that it will be useful,                *
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of         *
+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the          *
+ *    GNU General Public License for more details.                           *
+ *                                                                           *
+ *    You should have received a copy of the GNU General Public License      *
+ *    along with KLog.  If not, see <https://www.gnu.org/licenses/>.         *
+ *                                                                           *
+ *****************************************************************************/
+/*
+    This class defines a test to try to control DB executions from one
+    single place.
+    This class may be removed without any notice :)
+*/
 
 #include <QObject>
 #include <QSqlQuery>

src/dataproxy_sqlite.h

@@ -310,7 +310,7 @@ class DataProxy_SQLite : public QObject
     bool addDXCCEntitySubdivision(const QString &_name, const QString &_short, const QString &_pref, const QString &_group, const int _regId, const int _dxcc, const int _cq, const int _itu, const QDate &_startDate, const QDate &_endDate, const bool _deleted);
 
     //void getFoundInLog(const QString &_txt, const int _log=-1);
-    QString getADIFQSO(const int _qsoId, ExportMode _em = ModeADIF);
+    KLOG_DEPRECATED QString getADIFQSO(const int _qsoId, ExportMode _em = ModeADIF);
     QString getADIFValueFromRec(QSqlRecord _rec, const QString &_fieldName);   // To refactor the getADIFFromQSOQuery function
     QString getADIFFromQSOQuery(QSqlRecord _rec, ExportMode _em = ModeADIF, bool _justMarked = false, bool _onlyRequested = false, int _logN = -1);
     //QString getADIFFromQSOQuery2(QSqlRecord _rec, ExportMode _em = ModeADIF, bool _justMarked = false, bool _onlyRequested = false, int _logN = -1);

src/elogqrzlog.cpp

@@ -639,7 +639,12 @@ int eLogQrzLog::sendQSO(const int _qsoID)
     // Received an ID, obtains the ADIF fo QRZ.com from dataProxy and sends it t QRZ.com
     //qDebug() << "eLogQrzLog::sendQSO: "  << QString::number(_qsoID);
     showDebugLog (Q_FUNC_INFO, "Start: " + QString::number(_qsoID));
-    QString adifQSO = dataProxy->getADIFQSO(_qsoID, ModeEQSL);
+    QSO qso;
+    qso.fromDB(_qsoID);
+    if (!qso.isComplete())
+        return -1;
+    //QString adifQSO = dataProxy->getADIFQSO(_qsoID, ModeEQSL);
+    QString adifQSO =  qso.getADIF();
 
     //qDebug()<< "eLogQrzLog::sendQSO: (ADIF) :" << adifQSO;
     //qDebug()<< "eLogQrzLog::sendQSO: (KEY) :" << logbookkey;

src/global.h

@@ -1,6 +1,33 @@
 #ifndef KLOG_GLOBAL_H
 #define KLOG_GLOBAL_H
+/***************************************************************************
+                          global.h  -  description
+                             -------------------
+    begin                : Apr 2023
+    copyright            : (C) 2023 by Jaime Robles
+    email                : [email protected]
+ ***************************************************************************/
 
+/*****************************************************************************
+ * This file is part of KLog.                                                *
+ *                                                                           *
+ *    KLog is free software: you can redistribute it and/or modify           *
+ *    it under the terms of the GNU General Public License as published by   *
+ *    the Free Software Foundation, either version 3 of the License, or      *
+ *    (at your option) any later version.                                    *
+ *                                                                           *
+ *    KLog is distributed in the hope that it will be useful,                *
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of         *
+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the          *
+ *    GNU General Public License for more details.                           *
+ *                                                                           *
+ *    You should have received a copy of the GNU General Public License      *
+ *    along with KLog.  If not, see <https://www.gnu.org/licenses/>.         *
+ *                                                                           *
+ *****************************************************************************/
+/*
+    This class defines global topics.
+*/
 extern bool g_callsignCheck;
 #if __cplusplus >= 201309L
     // use modern deprecation feature

src/inputwidgets/mainwindowmydatatab.cpp

@@ -704,7 +704,7 @@ bool MainWindowMyDataTab::setMySig_info(const QString &_op)
 {
     if (_op.length()<=0)
         return false;
-    my_sig = _op;
+    my_sig_info = _op;
     slotMyUserADIFComboBoxChanged();
     return true;
 }