diff --git a/README.md b/README.md index 0c4199fa8..f4e194247 100644 --- a/README.md +++ b/README.md @@ -28,7 +28,7 @@ The QuickBox is built upon the Qt framework, targeted for Linux and Windows and * results print and export (PDF | [IOF XML](https://github.com/international-orienteering-federation/datastandard-v3)) * export results for Liveresultat and Emma client * [Weblate localization](https://hosted.weblate.org/projects/quickbox/) - thanks to Michal Cihar and https://weblate.org/ for free localization hosting -* integration with [ORIS](https://oris.orientacnisporty.cz/) - Czech orienteering federation information system +* integration with [ORIS](https://oris.ceskyorientak.cz/) - Czech orienteering federation information system * import events * sync entries * import clubs and registrations diff --git a/quickevent/app/quickevent/plugins/Oris/src/chooseoriseventdialog.cpp b/quickevent/app/quickevent/plugins/Oris/src/chooseoriseventdialog.cpp index d67238ae4..d46c74778 100644 --- a/quickevent/app/quickevent/plugins/Oris/src/chooseoriseventdialog.cpp +++ b/quickevent/app/quickevent/plugins/Oris/src/chooseoriseventdialog.cpp @@ -46,7 +46,7 @@ void ChooseOrisEventDialog::load() //QCoreApplication::processEvents(); QDate d = QDate::currentDate(); d = d.addMonths(-1); - QUrl url("https://oris.orientacnisporty.cz/API/?format=json&method=getEventList&all=1&datefrom=" + d.toString(Qt::ISODate)); + QUrl url("https://" + OrisImporter::orisDomainName() + "/API/?format=json&method=getEventList&all=1&datefrom=" + d.toString(Qt::ISODate)); m_importer->getJsonAndProcess(url, this, [this](const QJsonDocument &jsd) { //qfWarning() << QString::fromUtf8(jsd.toJson()); OrisImporter::saveJsonBackup("EventList", jsd); diff --git a/quickevent/app/quickevent/plugins/Oris/src/orisimporter.cpp b/quickevent/app/quickevent/plugins/Oris/src/orisimporter.cpp index 5f5e242fc..4c9910ac4 100644 --- a/quickevent/app/quickevent/plugins/Oris/src/orisimporter.cpp +++ b/quickevent/app/quickevent/plugins/Oris/src/orisimporter.cpp @@ -102,6 +102,12 @@ OrisImporter::OrisImporter(QObject *parent) } +QString OrisImporter::orisDomainName() +{ + static auto s = QStringLiteral("oris.ceskyorientak.cz"); + return s; +} + qf::core::network::NetworkAccessManager *OrisImporter::networkAccessManager() { if(!m_networkAccessManager) { @@ -186,7 +192,7 @@ void OrisImporter::syncRelaysEntries(int event_id, std::function succes return; } */ - QUrl url(QString("https://oris.orientacnisporty.cz/ExportPrihlasek?id=%1").arg(event_id)); + QUrl url(QString("https://" + OrisImporter::orisDomainName() + "/ExportPrihlasek?id=%1").arg(event_id)); getTextAndProcess(url, this, [=](const QByteArray &data) { qf::gui::framework::MainWindow *fwk = qf::gui::framework::MainWindow::frameWork(); try { @@ -378,7 +384,7 @@ QString jsonObjectToFullName(const QJsonObject &data, const QString &field_name) void OrisImporter::importEvent(int event_id, std::function success_callback) { - QUrl url(QString("https://oris.orientacnisporty.cz/API/?format=json&method=getEvent&id=%1").arg(event_id)); + QUrl url(QString("https://" + OrisImporter::orisDomainName() + "/API/?format=json&method=getEvent&id=%1").arg(event_id)); getJsonAndProcess(url, this, [this, event_id, success_callback](const QJsonDocument &jsd) { qf::gui::framework::MainWindow *fwk = qf::gui::framework::MainWindow::frameWork(); try { @@ -514,7 +520,7 @@ void OrisImporter::syncEventEntries(int event_id, std::function success syncRelaysEntries(event_id, success_callback); return; } - QUrl url(QString("https://oris.orientacnisporty.cz/API/?format=json&method=getEventEntries&eventid=%1").arg(event_id)); + QUrl url(QString("https://" + OrisImporter::orisDomainName() + "/API/?format=json&method=getEventEntries&eventid=%1").arg(event_id)); getJsonAndProcess(url, this, [=](const QJsonDocument &jsd) { static const QString json_fn = "EventEntries"; saveJsonBackup(json_fn, jsd); @@ -821,7 +827,7 @@ void OrisImporter::importRegistrations(std::function success_callback) year = QInputDialog::getInt(nullptr, tr("Import ORIS Registrations"), tr("Year of registration:"), year, year-2, year+2, 1, &ok); if (!ok) return; - QUrl url(QString("https://oris.orientacnisporty.cz/API/?format=json&method=getRegistration&sport=%1&year=%2").arg(sport_id).arg(year)); + QUrl url(QString("https://" + OrisImporter::orisDomainName() + "/API/?format=json&method=getRegistration&sport=%1&year=%2").arg(sport_id).arg(year)); getJsonAndProcess(url, this, [=](const QJsonDocument &jsd) { saveJsonBackup("Registrations", jsd); qf::gui::framework::MainWindow *fwk = qf::gui::framework::MainWindow::frameWork(); @@ -878,7 +884,7 @@ void OrisImporter::importRegistrations(std::function success_callback) void OrisImporter::importClubs(std::function success_callback) { - QUrl url("https://oris.orientacnisporty.cz/API/?format=json&method=getCSOSClubList"); + QUrl url("https://" + OrisImporter::orisDomainName() + "/API/?format=json&method=getCSOSClubList"); getJsonAndProcess(url, this, [=](const QJsonDocument &jsd) { saveJsonBackup("Clubs", jsd); qf::gui::framework::MainWindow *fwk = qf::gui::framework::MainWindow::frameWork(); @@ -919,7 +925,7 @@ void OrisImporter::importClubs(std::function success_callback) void OrisImporter::getAndImportClub(const QString &club, const QString &key) { - QUrl url(QString("https://oris.orientacnisporty.cz/API/?format=json&method=getClub&id=%1&eventkey=%2").arg(club).arg(key)); + QUrl url(QString("https://" + OrisImporter::orisDomainName() + "/API/?format=json&method=getClub&id=%1&eventkey=%2").arg(club).arg(key)); getJsonAndProcess(url, this, [club](const QJsonDocument &jsd) { saveJsonBackup(QString("Club_%1").arg(club), jsd); QJsonObject data = jsd.object().value(QStringLiteral("Data")).toObject(); diff --git a/quickevent/app/quickevent/plugins/Oris/src/orisimporter.h b/quickevent/app/quickevent/plugins/Oris/src/orisimporter.h index 3ea40ce1a..6bc1c555d 100644 --- a/quickevent/app/quickevent/plugins/Oris/src/orisimporter.h +++ b/quickevent/app/quickevent/plugins/Oris/src/orisimporter.h @@ -16,6 +16,8 @@ class OrisImporter : public QObject public: explicit OrisImporter(QObject *parent = nullptr); + static QString orisDomainName(); + void chooseAndImport(); void importEvent(int event_id, std::function success_callback = nullptr); void syncCurrentEventEntries(std::function success_callback = nullptr); diff --git a/quickevent/app/quickevent/src/appversion.h b/quickevent/app/quickevent/src/appversion.h index f7895f23c..35808ab48 100644 --- a/quickevent/app/quickevent/src/appversion.h +++ b/quickevent/app/quickevent/src/appversion.h @@ -1,4 +1,4 @@ #pragma once -#define APP_VERSION "3.4.7" +#define APP_VERSION "3.4.8"