Skip to content

QRZCallEU: Add QRZCALL.EU callbook and QSO upload #1042

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Ron6519 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

QRZCallEU: Add QRZCALL.EU callbook and QSO upload #1042

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions QLog.pro
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,6 +167,7 @@ SOURCES += \
service/lotw/Lotw.cpp \
service/potaapp/PotaApp.cpp \
service/qrzcom/QRZ.cpp \
service/qrzcalleu/QRZCallEU.cpp \
ui/ActivityEditor.cpp \
ui/AlertRuleDetail.cpp \
ui/AlertSettingDialog.cpp \
Expand Down Expand Up @@ -361,6 +362,7 @@ HEADERS += \
service/lotw/Lotw.h \
service/potaapp/PotaApp.h \
service/qrzcom/QRZ.h \
service/qrzcalleu/QRZCallEU.h \
ui/ActivityEditor.h \
ui/AlertRuleDetail.h \
ui/AlertSettingDialog.h \
Expand Down
5 changes: 5 additions & 0 deletions core/CallbookManager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
#include "core/debug.h"
#include "service/hamqth/HamQTH.h"
#include "service/qrzcom/QRZ.h"
#include "service/qrzcalleu/QRZCallEU.h"
#include "data/Callsign.h"
#include "LogParam.h"

Expand Down Expand Up @@ -70,6 +71,10 @@ GenericCallbook *CallbookManager::createCallbook(const QString &callbookID)
{
ret = new QRZCallbook(this);
}
else if ( callbookID == QRZCallEUCallbook::CALLBOOK_NAME )
{
ret = new QRZCallEUCallbook(this);
}

if ( ret )
{
Expand Down
10 changes: 10 additions & 0 deletions core/LogParam.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -417,6 +417,16 @@ void LogParam::setClublogUploadImmediatelyEnabled(bool state)
setParam("services/clublog/logbook/uploadimmediately", state);
}

bool LogParam::getQRZCallEUUploadImmediatelyEnabled()
{
return getParam("services/qrzcalleu/logbook/uploadimmediately", false).toBool();
}

void LogParam::setQRZCallEUUploadImmediatelyEnabled(bool state)
{
setParam("services/qrzcalleu/logbook/uploadimmediately", state);
}

QString LogParam::getEQSLLogbookUsername()
{
return getParam("services/eqsl/logbook/username").toString().trimmed();
Expand Down
2 changes: 2 additions & 0 deletions core/LogParam.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,8 @@ class LogParam : public QObject
static void setClublogLogbookReqEmail(const QString& email);
static bool getClublogUploadImmediatelyEnabled();
static void setClublogUploadImmediatelyEnabled(bool state);
static bool getQRZCallEUUploadImmediatelyEnabled();
static void setQRZCallEUUploadImmediatelyEnabled(bool state);

/*********
* eQSL
Expand Down
3 changes: 3 additions & 0 deletions core/Migration.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1201,6 +1201,8 @@ bool DBSchemaMigration::refreshUploadStatusTrigger()
" 'hrdlog_qso_upload_status', "
" 'qrzcom_qso_upload_date', "
" 'qrzcom_qso_upload_status', "
" 'qrzcalleu_qso_upload_date', "
" 'qrzcalleu_qso_upload_status', "
" 'hamlogeu_qso_upload_date', "
" 'hamlogeu_qso_upload_status', "
" 'hamqth_qso_upload_date', "
Expand Down Expand Up @@ -1246,6 +1248,7 @@ bool DBSchemaMigration::refreshUploadStatusTrigger()
" UPDATE contacts "
" SET hrdlog_qso_upload_status = CASE WHEN old.hrdlog_qso_upload_status = 'Y' AND (%3) THEN 'M' ELSE old.hrdlog_qso_upload_status END, "
" qrzcom_qso_upload_status = CASE WHEN old.qrzcom_qso_upload_status = 'Y' THEN 'M' ELSE old.qrzcom_qso_upload_status END , "
" qrzcalleu_qso_upload_status = CASE WHEN old.qrzcalleu_qso_upload_status = 'Y' THEN 'M' ELSE old.qrzcalleu_qso_upload_status END , "
" hamlogeu_qso_upload_status = CASE WHEN old.hamlogeu_qso_upload_status = 'Y' THEN 'M' ELSE old.hamlogeu_qso_upload_status END , "
" hamqth_qso_upload_status = CASE WHEN old.hamqth_qso_upload_status = 'Y' THEN 'M' ELSE old.hamqth_qso_upload_status END , "
" clublog_qso_upload_status = CASE WHEN old.clublog_qso_upload_status = 'Y' AND (%4) THEN 'M' ELSE old.clublog_qso_upload_status END "
Expand Down
2 changes: 1 addition & 1 deletion core/Migration.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ class DBSchemaMigration : public QObject
bool run(bool force = false);
static bool backupAllQSOsToADX(bool force = false);

static constexpr int latestVersion = 38;
static constexpr int latestVersion = 39;

private:
bool functionMigration(int version);
Expand Down
1 change: 1 addition & 0 deletions res/res.qrc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,5 +51,6 @@
<file>sql/migration_036.sql</file>
<file>sql/migration_037.sql</file>
<file>sql/migration_038.sql</file>
<file>sql/migration_039.sql</file>
</qresource>
</RCC>
3 changes: 3 additions & 0 deletions res/sql/migration_039.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
ALTER TABLE contacts ADD qrzcalleu_qso_upload_date TEXT;
ALTER TABLE contacts ADD qrzcalleu_qso_upload_status CHECK(qrzcalleu_qso_upload_status IN ('N', 'Y', 'M')) DEFAULT 'N';
UPDATE contacts SET qrzcalleu_qso_upload_status = 'N' WHERE qrzcalleu_qso_upload_status IS NULL;
Loading