mirror of
https://gitlab.com/spaceti-app/integrations/acs/colnod-connector.git
synced 2026-07-12 19:20:37 +02:00
delete unnecessary
This commit is contained in:
parent
18032ef1fc
commit
d7b9c15dd6
@ -30,7 +30,7 @@ int main(int argc, char *argv[])
|
|||||||
|
|
||||||
|
|
||||||
// Logger initializiaton
|
// Logger initializiaton
|
||||||
serversdk::initAppLogger(); // <-- then Logger::outputMessage will handle all messages
|
serversdk::initAppLogger();
|
||||||
|
|
||||||
// Log messge Filtering
|
// Log messge Filtering
|
||||||
QStringList filters;
|
QStringList filters;
|
||||||
|
|||||||
@ -292,26 +292,6 @@ void ColnodAPI::setUserName(const QString &userName)
|
|||||||
mUserName = userName;
|
mUserName = userName;
|
||||||
}
|
}
|
||||||
|
|
||||||
void ColnodAPI::areDataReady(const std::shared_ptr<Data> &data)
|
|
||||||
{
|
|
||||||
if (++amountData == 4) {
|
|
||||||
|
|
||||||
// new
|
|
||||||
qInfo(colnod) << "- src colnod: tokens [" << data->updatedTokens.size() << ":" << data->deletedTokens.size() <<
|
|
||||||
"] subjects [" << data->updatedSubjects.size() << ":" << data->deletedSubjects.size() << "] [ added/updated : deleted ]";
|
|
||||||
//OLD
|
|
||||||
// qInfo(colnod) << tab << "-> COLNOD DATA:";
|
|
||||||
// qInfo(colnod) << tab << tab << data->updatedTokens.size() << "TOKENS WERE ADDED/UPDATED";
|
|
||||||
// qInfo(colnod) << tab << tab << data->deletedTokens.size() << "TOKENS DELETED";
|
|
||||||
// qInfo(colnod) << tab << tab << data->updatedSubjects.size() << "SUBJECTS WERE ADDED/UPDATED";
|
|
||||||
// qInfo(colnod) << tab << tab << data->deletedSubjects.size() << "SUBJECTS DELETED";
|
|
||||||
// qInfo(colnod) << dash;
|
|
||||||
|
|
||||||
amountData = 0;
|
|
||||||
emit downloadDataFinished(data);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
void ColnodAPI::isDataProcessFinished(bool success)
|
void ColnodAPI::isDataProcessFinished(bool success)
|
||||||
{
|
{
|
||||||
if (!success) {
|
if (!success) {
|
||||||
|
|||||||
@ -65,7 +65,6 @@ public:
|
|||||||
bool isValid();
|
bool isValid();
|
||||||
|
|
||||||
private:
|
private:
|
||||||
Q_SLOT void areDataReady(const std::shared_ptr<Data>& data);
|
|
||||||
Q_SLOT void isDataProcessFinished(bool success);
|
Q_SLOT void isDataProcessFinished(bool success);
|
||||||
|
|
||||||
private:
|
private:
|
||||||
@ -83,24 +82,19 @@ private:
|
|||||||
|
|
||||||
signals:
|
signals:
|
||||||
void downloadDataFinished(std::shared_ptr<Data> = std::shared_ptr<Data>());
|
void downloadDataFinished(std::shared_ptr<Data> = std::shared_ptr<Data>());
|
||||||
void partOfDataReady(std::shared_ptr<Data> = std::shared_ptr<Data>());
|
|
||||||
void partOfDataProcessFinished(bool success = true);
|
void partOfDataProcessFinished(bool success = true);
|
||||||
void dataProcessFinished(bool success = true);
|
void dataProcessFinished(bool success = true);
|
||||||
|
|
||||||
void error();
|
|
||||||
|
|
||||||
private:
|
private:
|
||||||
serversdk::RequestManager* mReqMan = nullptr;
|
serversdk::RequestManager* mReqMan = nullptr;
|
||||||
QString mHost = "https://192.168.1.3:8443";
|
QString mHost = "https://192.168.1.3:8443";
|
||||||
QString mUserName;
|
QString mUserName;
|
||||||
QString mPassword;
|
QString mPassword;
|
||||||
Timestamp mLastSync;
|
|
||||||
bool mDryMode = false;
|
bool mDryMode = false;
|
||||||
bool mValid = true;
|
bool mValid = true;
|
||||||
bool mSuccess = true;
|
bool mSuccess = true;
|
||||||
|
|
||||||
QString authToken;
|
QString authToken;
|
||||||
qint16 amountData = 0;
|
|
||||||
qint16 amountProccessesFinished = 0;
|
qint16 amountProccessesFinished = 0;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@ -1,14 +1,5 @@
|
|||||||
#include "data.h"
|
#include "data.h"
|
||||||
|
|
||||||
|
|
||||||
void Data::clear()
|
|
||||||
{
|
|
||||||
updatedTokens.clear();
|
|
||||||
updatedSubjects.clear();
|
|
||||||
deletedTokens.clear();
|
|
||||||
deletedSubjects.clear();
|
|
||||||
}
|
|
||||||
|
|
||||||
bool Data::loadTokensFromJson(const QByteArray &data)
|
bool Data::loadTokensFromJson(const QByteArray &data)
|
||||||
{
|
{
|
||||||
if (data.isEmpty())
|
if (data.isEmpty())
|
||||||
|
|||||||
@ -28,8 +28,6 @@ class Data
|
|||||||
public:
|
public:
|
||||||
Data() = default;
|
Data() = default;
|
||||||
|
|
||||||
void clear();
|
|
||||||
|
|
||||||
bool loadTokensFromJson(const QByteArray &data);
|
bool loadTokensFromJson(const QByteArray &data);
|
||||||
bool loadSubjectsFormJson(const QByteArray &data);
|
bool loadSubjectsFormJson(const QByteArray &data);
|
||||||
|
|
||||||
@ -40,7 +38,6 @@ public:
|
|||||||
|
|
||||||
int incrementCounter();
|
int incrementCounter();
|
||||||
|
|
||||||
|
|
||||||
private:
|
private:
|
||||||
int counter = 0;
|
int counter = 0;
|
||||||
};
|
};
|
||||||
|
|||||||
@ -24,8 +24,6 @@ class Token : public serversdk::DatabaseTable {
|
|||||||
TABLE_PROPERTY(QDateTime, lastModified, setLastModified, QDateTime())
|
TABLE_PROPERTY(QDateTime, lastModified, setLastModified, QDateTime())
|
||||||
TABLE_PROPERTY(bool, deleted, setDeleted, false)
|
TABLE_PROPERTY(bool, deleted, setDeleted, false)
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
public:
|
public:
|
||||||
/**
|
/**
|
||||||
* # Needed values to proper sync
|
* # Needed values to proper sync
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user